From c92cc5f5b7fb17989f2bf0d82b777e93905f236e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 19 Aug 2019 14:48:10 +0200
Subject: [PATCH] version bump to 2.5.6 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c57da8926d32253879a7b4fb087ded8ac461ca91..6f484990fb41b5e498064d37f517c2697d22d33d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.5.6
+* fixes for Jingle file transfer
+* fixed some rare crashes
+
 ### Version 2.5.5
 * allow backups to be restored from anywhere
 * bug fixes
diff --git a/build.gradle b/build.gradle
index 23058b43c2838f3f4f3aa11315b2daf1cc4c2c5f..99c1ebfaac9756f6f3b6fcc8c14bbdf4594d639e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,8 +81,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 334
-        versionName "2.5.5"
+        versionCode 336
+        versionName "2.5.6"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId