aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-21 13:58:15 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-21 13:58:15 +0200
commit33218ec32a47292a46d574e5107164b8e8a72e40 (patch)
treea0800cb659a82474d660fc046bfeeede4b86b2a0
parenta8420c9ad0d6c13e98aea77878644335d2dd2f8f (diff)
version bump to 1.12.4 + changelog
-rw-r--r--CHANGELOG.md4
-rw-r--r--build.gradle4
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca525a6d3..02fb9280f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
###Changelog
+####Version 1.12.4
+* show offline members in conference (needs server support)
+* various bug fixes
+
####Version 1.12.3
* make omemo default when all resources support it
* show presence of other resources as template
diff --git a/build.gradle b/build.gradle
index 1a1474d64..74b98a166 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 144
- versionName "1.12.3"
+ versionCode 145
+ versionName "1.12.4"
archivesBaseName += "-$versionName"
applicationId "eu.siacs.conversations"
}