Merge branch 'release/0.9.5' into develop

Author: bmarty

CHANGES.rst

@@ -1,28 +1,18 @@
-Changes in Riot 0.9.5 (2019-XX-XX)
+Changes in Riot 0.9.5 (2019-09-10)
 ===================================================
 
-MatrixSdk:
- - Upgrade MatrixSdk to version 0.X.Y.
- - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.X.Y
-
 Features:
  - Auto configure homeserver and identity server URLs of LoginActivity with a magic link (#3294)
 
 Improvements:
  - Handle correctly the error 404 when entering a homeserver URL on the login screen
 
-Other changes:
- -
-
 Bugfix:
  - Restore correctly the login form when coming back from SSO login form.
 
 Translations:
  - Riot is fully translated into Korean thanks to paijai.
 
-Build:
- -
-
 Changes in Riot 0.9.4 (2019-08-28)
 ===================================================
 

build.gradle

@@ -24,7 +24,7 @@ buildscript {
 // global properties used in sub modules
 ext {
     versionCodeProp = 90500
-    versionNameProp = "0.9.5-dev"
+    versionNameProp = "0.9.5"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }