Merge branch 'master' into development

iNPUTmice created 11 years ago

Conflicts:
	AndroidManifest.xml

Change summary

AndroidManifest.xml | 2 +-
CHANGELOG.md        | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)

Detailed changes

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="23"
+    android:versionCode="24"
     android:versionName="0.6-alpha" >
 
     <uses-sdk

CHANGELOG.md

@@ -1,6 +1,9 @@
 ###Changelog
 
-###Version 0.5.1
+####Version 0.5.2
+* minor bug fixes
+
+####Version 0.5.1
 * couple of small bug fixes that have been missed in 0.5
 * complete translations for Swedish, Dutch, German, Spanish, French, Russian