From 0bd4105b1d43fd580e9cd8f6ad80a78baa45a06a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 17 Oct 2015 16:11:13 +0200
Subject: [PATCH] version bump to 1.7.0-beta

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61d18a86..663079d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ###Changelog
 
+####Version 1.7.0
+* CAPTCHA support
+* SASL EXTERNAL (client certifiates)
+* fetching MUC history via MAM
+* redownload deleted files from HTTP hosts
+* Expert setting to automatically set presence
+* bug fixes
+
 ####Version 1.6.11
 * tab completion for MUC nicks
 * history export
diff --git a/build.gradle b/build.gradle
index d52af31e..40e33103 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,8 +49,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 98
-		versionName "1.6.11"
+		versionCode 99
+		versionName "1.7.0-beta"
 		project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
 	}