From b27fa6d206e7995a5431bdccacb809ba68c0c0e8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 5 Oct 2018 12:56:19 +0200
Subject: [PATCH] version bump to 2.3.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f13c074b2..d0e894f59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### Version 2.3.1
+* Stronger compression for video files
+* Use SNI on STARTTLS to fix gtalk
+* Fix Quite Hours on Android 8+
+* Use Consistent Color Generation (XEP-0392)
+
 ### Version 2.3.0
 * Preview and ask for confirmation before sending media files
 * View per conversation media files in contact and conference details screens
diff --git a/build.gradle b/build.gradle
index 328c7abc0..5c6c4d1fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     }
     implementation 'org.sufficientlysecure:openpgp-api:10.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
+    //noinspection GradleCompatible
     implementation "com.android.support:support-v13:$supportLibVersion"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation "com.android.support:cardview-v7:$supportLibVersion"
@@ -66,8 +67,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 290
-        versionName "2.3.0"
+        versionCode 293
+        versionName "2.3.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId