From 63cc5f96edd53598a68059d3450eb93c938b1325 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Nov 2019 14:42:44 +0100
Subject: [PATCH] version bump to 2.6.0-beta + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9e9d087c..98f7cb83d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### Version 2.6.0
+* Introduce expert setting to perform channel discovery on local server instead of [search.jabber.network](https://search.jabber.network)
+* Enable delivery check marks by default and remove setting
+* Enable ‘Send button indicates status’ by default and remove setting
+* Move Backup and Foreground Service settings to main screen
+
 ### Version 2.5.12
 * Jingle file transfer fixes
 * Fixed OMEMO self healing (after backup restore) on servers w/o MAM
diff --git a/build.gradle b/build.gradle
index 8ae6e4e49..06463931f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,8 +84,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 346
-        versionName "2.5.12"
+        versionCode 347
+        versionName "2.6.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId