From 63f4625266a7584895ef181b9da5581b36f3c983 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Oct 2018 15:46:57 +0200
Subject: [PATCH] version bump to 2.3.2 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0e894f5971b69fc17fab958f61ca2bea201fcbc..02a84b028c42efc358c00b3eb40f442c72c013c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.3.2
+* Fixed OMEMO on Android 5.1 & 6.0
+* Added setting for video quality
+* bug fixes
+
 ### Version 2.3.1
 * Stronger compression for video files
 * Use SNI on STARTTLS to fix gtalk
diff --git a/build.gradle b/build.gradle
index f4e9984928c51da62802897f30bb62df16ff0b66..9d2bcc82c0830df17beb531201ef1b4de6a49a07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,8 +67,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 293
-        versionName "2.3.1"
+        versionCode 294
+        versionName "2.3.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId