From 6c10f8a23223816d46bfc8fa40a85b5d3fcabe9c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 21 Dec 2016 14:04:56 +0100
Subject: [PATCH] version bump to 1.15.1+ changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17c7a9396..319564ccc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 1.15.1
+* support for POSH (RFC7711)
+* support for quoting messages (via select text)
+* verified messages show shield icon. unverified messages show lock
+
 ####Version 1.15.0
 * New [Blind Trust Before Verification](https://gultsch.de/trust.html) mode
 * Easily share Barcode and XMPP uri from Account details
diff --git a/build.gradle b/build.gradle
index 9e244f657..7c10bedef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 186
-        versionName "1.15.0"
+        versionCode 187
+        versionName "1.15.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }