diff options
author | Christian S <christian@pix-art.de> | 2016-04-16 19:29:38 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-04-16 19:29:38 +0200 |
commit | 10a608d05b5cbb8a2da920907db22c74e22194f0 (patch) | |
tree | a12150426174f16f251727048a01a61adae13f7c | |
parent | 555b4ac7663e79ef4226cbd620de9dbfbdcd2eb4 (diff) | |
parent | bfe01c432244e04daf6804d5cfc3b838ea247c4b (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
-rw-r--r-- | CHANGELOG.md | 5 | ||||
-rw-r--r-- | build.gradle | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 325d9f9b9..f52520477 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 c72c9651f..0affd5d87 100644 --- a/build.gradle +++ b/build.gradle @@ -67,8 +67,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" } |