From b8c2e14c6ecf991888832d73f7a2d6dc4dc8ac4a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 8 Jul 2020 13:51:06 +0200
Subject: [PATCH] Release 3.36.0

---
 app/build.gradle                       | 4 ++--
 app/src/main/assets/changelogs/374.txt | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d07bf8e23..e3bad0031 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 373
-        versionName "2.36.0-beta-1"
+        versionCode 374
+        versionName "2.36.0"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
diff --git a/app/src/main/assets/changelogs/374.txt b/app/src/main/assets/changelogs/374.txt
index f8a871c33..dd6256ca4 100644
--- a/app/src/main/assets/changelogs/374.txt
+++ b/app/src/main/assets/changelogs/374.txt
@@ -8,6 +8,7 @@ changed:
 - Allow cross-account replies on followed instances
 
 Fixed:
+- Crash when adding media
 - Remove extra spaces at the bottom of messages
 - Some issue with custom emoji
 - Fix issue with "Your toots/notifications"