Merge branch 'develop' into feature/pin_code

CHANGES.md

@@ -1,15 +1,14 @@
-Changes in Element 1.0.3 (2020-XX-XX)
+Changes in Element 1.0.4 (2020-XX-XX)
 ===================================================
 
 Features ✨:
  - Protect access to the app by a pin code (#1700)
- - Support server admin option to disable E2EE for DMs / private rooms [users can still enable] (#1794)
 
 Improvements 🙌:
  -
 
 Bugfix 🐛:
- - Crash reported on playstore for HomeActivity launch (151 reports)
+ -
 
 SDK API changes ⚠️:
  -
@@ -20,6 +19,15 @@ Build 🧱:
 Other changes:
  -
 
+Changes in Element 1.0.3 (2020-07-31)
+===================================================
+
+Features ✨:
+ - Support server admin option to disable E2EE for DMs / private rooms [users can still enable] (#1794)
+
+Bugfix 🐛:
+ - Crash reported on playstore for HomeActivity launch (151 reports)
+
 Changes in Element 1.0.2 (2020-07-29)
 ===================================================
 

vector/build.gradle

@@ -17,7 +17,7 @@ androidExtensions {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 0
-ext.versionPatch = 3
+ext.versionPatch = 4
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'