From 79fe1c897252d0d6cebb62bc22b62ca07f045907 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 11 Jul 2018 21:48:54 +0200
Subject: [PATCH] version bump to 2.2.6 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8b2a874673ad4ce8f8ec596d612185bcd0cc484..84b3fd7733c1602b0e14e3d64d12e8ec31d09ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 2.2.6
+* support old MAM version to work with Prosody
+
 ### Version 2.2.5
 * Persist MUC avatar across restarts / show in bookmarks
 * Offer Paste as quote for HTML content
diff --git a/build.gradle b/build.gradle
index 16a28c8fad076c43e1a64f94ac11e8b1128ea95b..8f88917bff4330ff80a415da21c8705d095959ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,8 +67,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 277
-        versionName "2.2.5"
+        versionCode 278
+        versionName "2.2.6"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId