Merge tag 'v0.1.5' into develop

tag
1 year ago · a3c37cf2ad
4 changed files with 11 additions and 2 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,11 @@
				@@ -1,3 +1,11 @@
+Changes in Element X v0.1.5 (2023-08-28)
+========================================
+
+Bugfixes 🐛
+----------
+ - Fix crash when opening any room. ([#1160](https://github.com/vector-im/element-x-android/issues/1160))
+
+
 Changes in Element X v0.1.4 (2023-08-28)
 ========================================

--- a/changelog.d/1160.bugfix
+++ b/changelog.d/1160.bugfix
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-Fix crash when opening any room.
--- a/fastlane/metadata/android/en-US/changelogs/40001050.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40001050.txt
@ -0,0 +1,2 @@
				@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and add OIDC support.
+Full changelog: https://github.com/vector-im/element-x-android/releases
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@ -56,7 +56,7 @@ private const val versionMinor = 1
				@@ -56,7 +56,7 @@ private const val versionMinor = 1
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-private const val versionPatch = 6
+private const val versionPatch = 5

 object Versions {
    val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
				`@ -1 +0,0 @@` @@ -1 +0,0 @@
				`Fix crash when opening any room.`