Merge tag 'tchap_v2.9.7' into develop

no message
tchapgouv · Dec 18, 2023 · 1e5ff3a · 1e5ff3a
2 parents fbb8205 + 168bb88
commit 1e5ff3a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,17 @@
+Changes in Tchap 2.9.7 (2023-12-18)
+===================================
+
+Improvements 🙌
+--------------
+ - Mise à jour des endpoints pour la version de dev ([#991](https://github.com/tchapgouv/tchap-android/issues/991))
+ - Rebase against Element-Android v1.6.8 ([#998](https://github.com/tchapgouv/tchap-android/issues/998))
+
+Bugfixes 🐛
+----------
+ - Correction du crash du nommage du salon lors de sa création. ([#885](https://github.com/tchapgouv/tchap-android/issues/885))
+ - L'ouverture d'une pièce jointe (fichier. apk) entraîne la fermeture de l'application. ([#995](https://github.com/tchapgouv/tchap-android/issues/995))
+
+
 Changes in Tchap 2.9.6 (2023-10-30)
 ===================================
 

diff --git a/changelog.d/885.bugfix b/changelog.d/885.bugfix
diff --git a/changelog.d/991.improvements b/changelog.d/991.improvements
diff --git a/changelog.d/995.bugfix b/changelog.d/995.bugfix
diff --git a/changelog.d/998.improvements b/changelog.d/998.improvements
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.9.6"
+    version = "2.9.7"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 9
 // 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.
-ext.versionPatch = 6
+ext.versionPatch = 7
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'