Merge branch 'master' into development

iNPUTmice created 11 years ago

Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

Change summary

CHANGELOG.md | 3 +++
build.gradle | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)

Detailed changes

CHANGELOG.md

@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 0.8.4
+* bug fixes
+
 ####Version 0.8.3
 * increased UI performance
 * fixed rotation bugs

build.gradle

@@ -46,8 +46,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 19
-		versionCode 35
-		versionName "0.8.3"
+		versionCode 36
+		versionName "0.8.4"
 	}
 
 	compileOptions {