version bump to 1.12.0 + changelog

2016-05-02 11:05:53 +02:00 · 2016-05-02 11:05:53 +02:00 · 7674e01585
parent bf92ef6cd3
commit 7674e01585
2 changed files with 6 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,9 @@
 ###Changelog

+####Version 1.12.0
+* new welcome screen that makes it easier to register account
+* expert setting to modify presence
+
 ####Version 1.11.7
 * Share xmpp uri from conference details
 * add setting to allow quick sharing
--- a/build.gradle
+++ b/build.gradle
@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 140
-		versionName "1.11.7"
+		versionCode 141
+		versionName "1.12.0"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}