aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-02 00:15:02 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-02 00:15:02 +0200
commita6aa3be7a4f658350254e86f84391534c0502653 (patch)
tree6a71f62dd15c64353547238311ffcf74db253565
parentca16b910e14f269d4def0d6c57f966b981bf8759 (diff)
update build.gradle and CHANGELOG.md for upcoming 2.0.0
-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 2de469372..07061b9d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
### Changelog
+#### Version 2.0.0 (in development)
+* Integrate QR code scanner (requires camera permission)
+* Removed support for customizable resources
+* Add ability to change status message
+
#### Version 1.22.1
* show extended/TOR connection options in expert settings
* bug fixes
diff --git a/build.gradle b/build.gradle
index 12218799e..00e7ff6a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,8 +84,8 @@ android {
minSdkVersion 16
targetSdkVersion 25
- versionCode 220
- versionName "1.22.1"
+ versionCode 221
+ versionName "2.0.0 beta (2018-04-02)"
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"