From a6aa3be7a4f658350254e86f84391534c0502653 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 2 Apr 2018 00:15:02 +0200
Subject: update build.gradle and CHANGELOG.md for upcoming 2.0.0

---
 CHANGELOG.md | 5 +++++
 build.gradle | 4 ++--
 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"
-- 
cgit v1.2.3