From 0b11d0f7f2f6a2c21ff6b504c58f52ca62bb650f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 10 Mar 2017 10:14:06 +0100
Subject: [PATCH] version bump to 1.17.0 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc14264ba..1e371e283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Blocking a JID closes the corresponding conversation
 * Show message sender in conversation overview
 * Show unread counter for every conversation
+* Send typing notifications in private, non-anonymous MUCs
 * Support for the latest MAM namespace
 * Icons for attach menu
 
diff --git a/build.gradle b/build.gradle
index c1c7ea55d..853e91493 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 201
-        versionName "1.17.0-beta.2"
+        versionCode 202
+        versionName "1.17.0"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }