From edf0ae9aa6d191b5573b971c216038af0ef4980a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 9 Sep 2016 11:03:22 +0200
Subject: version bump to 1.14.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 532ad8d4..ae9a73cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 1.14.1
+* Press lock icon to see why OMEMO is deactivated
+* bug fixes
+
 ####Version 1.14.0
 * Improvments for N
 * Quick Reply to Notifications on N
diff --git a/build.gradle b/build.gradle
index 51a867ce..35fb52d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 171
-        versionName "1.14.0"
+        versionCode 172
+        versionName "1.14.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }
-- 
cgit v1.2.3