From bd15385145c3e53556b9d43295361059d1e1f8b7 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 24 Aug 2017 10:13:16 +0200
Subject: [PATCH] version bump to 1.20.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10bd530c5..31c3a6b84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 1.20.1
+* fixed OTR encrypted file transfer
+
 ### Version 1.20.0
 * presence subscription no longer required for OMEMO on compatible servers
 * display emoji-only messages slightly larger
diff --git a/build.gradle b/build.gradle
index 406f87ffe..3dcf849cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,8 +62,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 233
-        versionName "1.20.0"
+        versionCode 234
+        versionName "1.20.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }