From 8a81f85734dbf87b6fe882e66abdbd48c54fc791 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 4 May 2016 22:24:07 +0200
Subject: [PATCH] version bump to 1.12.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da54f8e592d60e54da9588f5deb7fe6219777444..92e90c110e276e8953cc95368ce41721ddca0d55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 1.12.1
+* small bug fixes
+
 ####Version 1.12.0
 * new welcome screen that makes it easier to register account
 * expert setting to modify presence
diff --git a/build.gradle b/build.gradle
index e3256fce463998e318386be030db7d0412d345ce..06f42f1b3cd699b86f8427c2bcc851452fe55ea8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 141
-		versionName "1.12.0"
+		versionCode 142
+		versionName "1.12.1"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}