Merge tag 'tchap_v2.12.0' into develop

no message
tchapgouv · Jul 22, 2024 · 217e6e2 · 217e6e2
2 parents b084ce4 + fe41cb0
commit 217e6e2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,15 @@
+Changes in Tchap 2.12.0 (2024-07-22)
+====================================
+
+Features ✨
+----------
+ - Forcer la génération du code de récupération et la sauvegarde automatique. ([#988](https://github.com/tchapgouv/tchap-android/issues/988))
+
+Improvements 🙌
+--------------
+ - Rebase against Element-Android v1.6.18 ([#1074](https://github.com/tchapgouv/tchap-android/issues/1074))
+ - Mise à jour du style quand un utilisateur est mentionné. ([#1075](https://github.com/tchapgouv/tchap-android/issues/1075))
+
 Changes in Tchap 2.11.11 (2024-06-24)
 =====================================
 

diff --git a/changelog.d/ 1074.improvements b/changelog.d/ 1074.improvements
diff --git a/changelog.d/1075.improvements b/changelog.d/1075.improvements
diff --git a/changelog.d/988.feature b/changelog.d/988.feature
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.11.11"
+    version = "2.12.0"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -33,11 +33,11 @@ knit {
 
 // Note: 2 digits max for each value
 ext.versionMajor = 2
-ext.versionMinor = 11
+ext.versionMinor = 12
 // 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 = 11
+ext.versionPatch = 0
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'