Merge tag 'tchap_v2.13.6' into develop

no message
tchapgouv · Oct 30, 2024 · 6cb2915 · 6cb2915
2 parents 053df77 + e9520c1
commit 6cb2915
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,17 @@
+Changes in Tchap 2.13.6 (2024-10-30)
+====================================
+
+Features ✨
+----------
+ - Activation des appels vidéos pour Éducation et Agent. ([#1121](https://github.com/tchapgouv/tchap-android/issues/1121))
+
+Improvements 🙌
+--------------
+ - Ajout d'une description pour le paramètre de notifications du compte. ([#1107](https://github.com/tchapgouv/tchap-android/issues/1107))
+ - Améliorer l'explication pour la génération d'un nouveau code de récupération. ([#1113](https://github.com/tchapgouv/tchap-android/issues/1113))
+ - Faciliter l'accès à l'aide sur la vérification d'appareil. ([#1116](https://github.com/tchapgouv/tchap-android/issues/1116))
+ - Améliorer l'explication pour un utilisateur voulant rejoindre un salon sans autorisation. ([#1118](https://github.com/tchapgouv/tchap-android/issues/1118))
+
 Changes in Tchap 2.13.5 (2024-10-01)
 ====================================
 

diff --git a/changelog.d/1107.improvements b/changelog.d/1107.improvements
diff --git a/changelog.d/1113.improvements b/changelog.d/1113.improvements
diff --git a/changelog.d/1116.improvements b/changelog.d/1116.improvements
diff --git a/changelog.d/1118.improvements b/changelog.d/1118.improvements
diff --git a/changelog.d/1121.feature b/changelog.d/1121.feature
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.14.0"
+    version = "2.13.6"
     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 = 14
+ext.versionMinor = 13
 // 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 = 0
+ext.versionPatch = 6
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'