From a883faf05e0d9fc6c40a0ae6d949edce62311c05 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 8 Mar 2018 16:55:36 +0100
Subject: [PATCH] change log for conversations 2.0 beta

---
 CHANGELOG.md | 9 +++++++++
 build.gradle | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 244d3bfe6..101da2427 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+### Version 2.0.0
+* OMEMO by default for everything but public group chats
+* Integrate QR code scanner (requires camera permission)
+* Removed support for OTR
+* Removed support for customizable resources
+* Removed slide out panel for conversation overview
+* Add ability to change status message
+* Highlight irregular unicode code blocks in Jabber IDs
+
 ### Version 1.23.8
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index b9b31a9c0..377a37bbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,8 +68,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 255
-        versionName "1.23.8"
+        versionCode 256
+        versionName "2.0.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId