Merge branch 'release/0.9.36' into develop

matrix-org · Sep 14, 2020 · 950682f · 950682f
2 parents 28d2b7e + d4a08c3
commit 950682f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,31 +1,13 @@
-Changes to Matrix Android SDK in 0.9.36 (2020-XX-XX)
+Changes to Matrix Android SDK in 0.9.36 (2020-09-14)
 =======================================================
 
-Features:
- -
-
 Improvements:
  - Crypto: Only create one olm session at a time per device (vector-im/riot-android#3056).
 
 Bugfix:
  - Killed Application misses some notifications
  - Fix a crash on the crypto code (race condition?)
 
-API Change:
- -
-
-Translations:
- -
-
-Others:
- -
-
-Build:
- -
-
-Test:
- -
-
 Changes to Matrix Android SDK in 0.9.35 (2020-05-20)
 =======================================================
 

diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle
@@ -28,7 +28,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 936
-        versionName "0.9.36-dev"
+        versionName "0.9.36"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Enable multi dex for test