From 7317f5015aa714c52a2b5ea12a90df8516ed6266 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 8 Feb 2017 16:51:49 +0100
Subject: [PATCH] version bump to 1.16.0 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4b6d001c..233a812ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 1.16.0
+* configurable client side message retention period
+* compress videos before sending them
+
 ####Version 1.15.5
 * show nick as bold text when mentioned in conference
 * bug fixes
diff --git a/build.gradle b/build.gradle
index e17d418d1..9746b247c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 193
-        versionName "1.15.5"
+        versionCode 196
+        versionName "1.16.0"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }