Merge branch 'release/0.2.0' into develop

2019-07-18 17:47:39 +02:00 · 2019-07-18 17:47:39 +02:00 · 4c128602b2
commit 4c128602b2
parent d87ee32422 d609c49b31
2 changed files with 3 additions and 11 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,4 +1,4 @@
-Changes in RiotX 0.2.1 (2019-XX-XX)
+Changes in RiotX 0.2.0 (2019-07-18)
 ===================================================

 Features:
@ -23,14 +23,6 @@ Bugfix:
 - Fix bad layout for room directory filter (#349)
 - Fix Copying link from a message shouldn't open context menu (#364)

-Translations:
- -
-
-Build:
- -
-
-
-
 Changes in RiotX 0.1.0 (2019-07-11)
 ===================================================

--- a/vector/build.gradle
+++ b/vector/build.gradle
@ -65,8 +65,8 @@ android {
        multiDexEnabled true

        // For release, use generateVersionCodeFromVersionName()
-        versionCode generateVersionCodeFromTimestamp()
-        // versionCode generateVersionCodeFromVersionName()
+        // versionCode generateVersionCodeFromTimestamp()
+        versionCode generateVersionCodeFromVersionName()

        versionName "${versionMajor}.${versionMinor}.${versionPatch}"