From 0f870223c4e25508708d40310cd12825ba53e537 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 20 Jan 2017 15:03:01 +0100
Subject: [PATCH] version bump to 1.15.5 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0727d3cbd..d4b6d001c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 1.15.5
+* show nick as bold text when mentioned in conference
+* bug fixes
+
 ####Version 1.15.4
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index 7ece3db18..2c3163826 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 192
-        versionName "1.15.4"
+        versionCode 193
+        versionName "1.15.5"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }