aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-07-22 14:48:07 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-07-22 14:48:07 +0200
commitc3ef8e0a5bcc36939a09973352623da1c6ed6b77 (patch)
tree82d6cdc1233af1c1140ac21fd927ec1df2acab41
parent66e3ccc2dcd22e2bd7b145b7cbbccccb9366ffcd (diff)
parent34dafc24af0e6e3d16a6169fd6e981e4535c23be (diff)
Merge branch 'master' into development
-rw-r--r--AndroidManifest.xml6
-rw-r--r--CHANGELOG.md5
2 files changed, 8 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c04bb82b..a755c98a 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="19"
- android:versionName="0.4.1" >
+ android:versionCode="20"
+ android:versionName="0.5-beta" >
<uses-sdk
android:minSdkVersion="14"
@@ -107,4 +107,4 @@
</activity>
</application>
-</manifest> \ No newline at end of file
+</manifest>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a7d9c63..433b580f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
###Changelog
+####Version 0.5
+* UI overhaul
+* MUC / Conference bookmarks
+* A lot of bug fixes
+
####Version 0.4
* OTR file encryption
* keep OTR messages and files on device until both parties or online at the same time