Merge branch 'release/v2.11.7'

tchapgouv · Jun 4, 2024 · 03d48a6 · 03d48a6
2 parents ae1101f + 5c44e8a
commit 03d48a6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,10 @@
+Changes in Tchap 2.11.7 (2024-06-04)
+====================================
+
+Bugfixes 🐛
+----------
+ - Mise à jour de l'URL vers l'aide. ([#906](https://github.com/tchapgouv/tchap-android/issues/906))
+
 Changes in Tchap 2.11.6 (2024-05-30)
 ====================================
 

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.11.6"
+    version = "2.11.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 = 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 = 6
+ext.versionPatch = 7
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.settings
 
 object VectorSettingsUrls {
     // TCHAP Redirect to Tchap FAQ
-    const val HELP = "https://www.tchap.gouv.fr/faq"
+    const val HELP = "https://aide.tchap.beta.gouv.fr"
     const val COPYRIGHT = "https://element.io/copyright"
     const val TAC = "https://www.tchap.gouv.fr/tac.html"
     const val PRIVACY_POLICY = "https://element.io/privacy"