From 71787bd2e1fbfe6faf34a38378a90c5df19e9ba1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 29 May 2016 20:54:41 +0200
Subject: [PATCH] version bump to 1.12.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 779d4f33b..a4fab8b3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 1.12.6
+* bug fixes
+
 ####Version 1.12.5
 * new create conference dialog
 * show first unread message on top
diff --git a/build.gradle b/build.gradle
index dc0dde1e4..59cf30194 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 146
-		versionName "1.12.5"
+		versionCode 147
+		versionName "1.12.6"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}