Merge branch 'develop' into yostyle/voip_all

tchapgouv · May 22, 2024 · 96efb05 · 96efb05
2 parents 6b17407 + 4f395dc
commit 96efb05
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,15 @@
+Changes in Tchap 2.11.5 (2024-05-22)
+====================================
+
+Bugfixes 🐛
+----------
+ - Ajout d'une exception de sécurité pour le domaine openmaptiles.github.io ([#1049](https://github.com/tchapgouv/tchap-android/issues/1049))
+
+Other changes
+-------------
+ - Suppression du variant sans VoIP. ([#1047](https://github.com/tchapgouv/tchap-android/issues/1047))
+
+
 Changes in Tchap 2.11.4 (2024-05-16)
 ====================================
 

diff --git a/changelog.d/1047.misc b/changelog.d/1047.misc
diff --git a/changelog.d/1049.bugfix b/changelog.d/1049.bugfix
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.11.4"
+    version = "2.11.5"
     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 = 11
 // 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 = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'