aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-10-17 16:11:13 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-10-17 16:11:13 +0200
commit0bd4105b1d43fd580e9cd8f6ad80a78baa45a06a (patch)
treea0d0138e6870f4b7146ff867671b403eaa74ece5
parentbe38b1e5f4ba646e303eefa90a2d7afe899dea7f (diff)
version bump to 1.7.0-beta
Diffstat (limited to '')
-rw-r--r--CHANGELOG.md8
-rw-r--r--build.gradle4
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);
}