From 5cee46cda529aa81ae647d5a4eb98f168dbe587c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 3 Aug 2017 14:21:48 +0200
Subject: [PATCH] version bump to 1.12.0-beta + changelog (untagged/unreleased)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2298b1dd8..10bd530c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 1.20.0
+* presence subscription no longer required for OMEMO on compatible servers
+* display emoji-only messages slightly larger
+
 ### Version 1.19.5
 * fixed connection loop on Android <4.4
 
diff --git a/build.gradle b/build.gradle
index e5e7ef1eb..97b694b7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,8 +59,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 228
-        versionName "1.19.5"
+        versionCode 229
+        versionName "1.20.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }