From 0419b24dce1d189384265d8c2613f24dde70d1a3 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 11 Jun 2017 20:08:39 +0200
Subject: version 1.18.2 + changes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a30b09e8..190ea7513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ### Changelog
 
+#### Version 1.18.2
+* colorize send button only after history is caught up
+* improved MAM catchup strategy
+* bug fixes
+
 #### Version 1.18.1
 * limited GPG encryption for MUC offline members
 * show extended connection settings for open version in export settings
diff --git a/build.gradle b/build.gradle
index 98cdde4bf..9e50a5bc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,8 +79,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
 
-        versionCode 197
-        versionName "1.18.1"
+        versionCode 199
+        versionName "1.18.2"
 
         archivesBaseName += "-$versionName"
         applicationId "de.pixart.messenger"
-- 
cgit v1.2.3