From 7219e077f42bd6da99a529380b7f0962a2bd7030 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 16 Jan 2017 12:07:50 +0100
Subject: [PATCH] version bump to 1.15.4 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 499866ea4c91dbcfeebddee92cb762247cd730c2..0727d3cbd4448aedf4aa34a665ecc101ca3673c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 1.15.4
+* bug fixes
+
 ####Version 1.15.3
 * show offline contacts in MUC as grayed-out
 * don't transcode gifs. add overlay indication to gifs
diff --git a/build.gradle b/build.gradle
index 3bc46c49953017a607683089432fd201e956a07c..7ece3db183e54317abc0a23f0718232fbabf01b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 189
-        versionName "1.15.3"
+        versionCode 192
+        versionName "1.15.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }