From 784df0c2185c7ec32da1196f60a97788deb974e5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 7 May 2016 11:35:12 +0200
Subject: [PATCH] version bump to 1.12.2 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92e90c110..535097701 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 1.12.2
+* fixed pgp presence signing
+
 ####Version 1.12.1
 * small bug fixes
 
diff --git a/build.gradle b/build.gradle
index 06f42f1b3..281da89e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 142
-		versionName "1.12.1"
+		versionCode 143
+		versionName "1.12.2"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}