From 233ee8a51c1fc508f38f5ef53050b8f8e7c2b7d4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 7 Mar 2017 20:01:16 +0100
Subject: [PATCH] version bump to 1.17.0-beta + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f610a4cfb..dc14264ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ###Changelog
 
+####Version 1.17.0
+* Do not notify for messages from strangers by default
+* Blocking a JID closes the corresponding conversation
+* Show message sender in conversation overview
+* Show unread counter for every conversation
+* Support for the latest MAM namespace
+* Icons for attach menu
+
 ####Version 1.16.2
 * change mam catchup strategie. support mam:1
 * bug fixes
diff --git a/build.gradle b/build.gradle
index 361a0878f..524281f38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 199
-        versionName "1.16.2"
+        versionCode 200
+        versionName "1.17.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }