aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-02 11:05:53 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-02 11:05:53 +0200
commit7674e01585902f8976febc41c4748d8ddb843506 (patch)
tree5941e62f559646d4de69f3352ac1fd66ae64fe96
parentbf92ef6cd3582146b6fda933bc8af489387fa63d (diff)
version bump to 1.12.0 + changelog1.12.0
Diffstat (limited to '')
-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 ed65a8d5..85dd1f3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
###Changelog
+####Version 1.12.0
+* new welcome screen that makes it easier to register account
+* expert setting to modify presence
+
####Version 1.11.7
* Share xmpp uri from conference details
* add setting to allow quick sharing
diff --git a/build.gradle b/build.gradle
index 27505bee..e3256fce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 140
- versionName "1.11.7"
+ versionCode 141
+ versionName "1.12.0"
archivesBaseName += "-$versionName"
applicationId "eu.siacs.conversations"
}