aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-16 12:59:54 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-16 12:59:54 +0100
commit726393f8da8b5e4dd10d4a7f37339810e0a9fa6c (patch)
tree4f5c6259d0b8cd83e04892fb56b6c036503c0246
parent349dd8291df78c33d6570d7f7937362ac08e4d66 (diff)
version bump to 1.10.0-beta and changelog
-rw-r--r--CHANGELOG.md5
-rw-r--r--build.gradle4
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe593143b..f847e94d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
###Changelog
+####Version 1.10.0
+* Support for XEP-0357: Push Notifications
+* Support for XEP-0308: Last Message Correction
+* introduced build flavors to make dependence on play-services optional
+
####Version 1.9.4
* prevent cleared Conversations from reloading history with MAM
* various MAM fixes
diff --git a/build.gradle b/build.gradle
index 34d63dfa0..ce88c4108 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,8 +58,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 123
- versionName "1.9.4"
+ versionCode 124
+ versionName "1.10.0-beta"
archivesBaseName += "-$versionName"
}