aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-04-14 23:13:44 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-04-14 23:13:44 +0200
commitbfe01c432244e04daf6804d5cfc3b838ea247c4b (patch)
treedbe42aba60b2a11b4760d02bb48ac7faa1f7a7bc
parente9494af098e6d3dad4f0a5328ae7342664ce853c (diff)
version bump to 1.11.7 + 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 683b8d73..ed65a8d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
###Changelog
+####Version 1.11.7
+* Share xmpp uri from conference details
+* add setting to allow quick sharing
+* various bug fixes
+
####Version 1.11.6
* added preference to disable notification light
* various bug fixes
diff --git a/build.gradle b/build.gradle
index a1d5710d..cd1d7186 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,8 +64,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 139
- versionName "1.11.6"
+ versionCode 140
+ versionName "1.11.7"
archivesBaseName += "-$versionName"
applicationId "eu.siacs.conversations"
}