aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml4
-rw-r--r--CHANGELOG.md9
2 files changed, 11 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97a27abb..70d18154 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations"
- android:versionCode="16"
- android:versionName="0.3" >
+ android:versionCode="17"
+ android:versionName="0.4-beta" >
<uses-sdk
android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1db04218..5a7d9c63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
###Changelog
+####Version 0.4
+* OTR file encryption
+* keep OTR messages and files on device until both parties or online at the same time
+* XEP-0333. Mark wether the other party has read your messages
+* Delayed messages are now tagged properly
+* Share images from the Gallery
+* Infinit history scrolling
+* Mark the last used presence in presence selection dialog
+
####Version 0.3
* Mostly bug fixes and internal rewrites
* Touch contact picture in conference to highlight