From 7674e01585902f8976febc41c4748d8ddb843506 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 2 May 2016 11:05:53 +0200
Subject: [PATCH] version bump to 1.12.0 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed65a8d5..85dd1f3b 100644
--- 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
diff --git a/build.gradle b/build.gradle
index 27505bee..e3256fce 100644
--- 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"
 	}