From 65c27843b1548e086f103f5949c2723b2511aac8 Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Mon, 3 Jun 2024 17:44:46 +0200
Subject: [PATCH 1/2] Update faq url (#1059)

---
 changelog.d/906.bugfix                                          | 1 +
 .../java/im/vector/app/features/settings/VectorSettingsUrls.kt  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/906.bugfix

diff --git a/changelog.d/906.bugfix b/changelog.d/906.bugfix
new file mode 100644
index 0000000000..2ba1498d49
--- /dev/null
+++ b/changelog.d/906.bugfix
@@ -0,0 +1 @@
+Mise à jour de l'URL vers l'aide.
\ No newline at end of file
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
index 1866fd351d..dbca1ed7c9 100644
--- 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"

From 5c44e8aec961514bbfe8d1d2b414267ca2168949 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Tue, 4 Jun 2024 17:14:46 +0200
Subject: [PATCH 2/2] Update version and  changelog

---
 TCHAP_CHANGES.md        | 7 +++++++
 changelog.d/906.bugfix  | 1 -
 towncrier.toml          | 2 +-
 vector-app/build.gradle | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/906.bugfix

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index 6c29bbfdf3..47e32b0dfb 100644
--- 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/changelog.d/906.bugfix b/changelog.d/906.bugfix
deleted file mode 100644
index 2ba1498d49..0000000000
--- a/changelog.d/906.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Mise à jour de l'URL vers l'aide.
\ No newline at end of file
diff --git a/towncrier.toml b/towncrier.toml
index 1936bfcb2e..42a8e4f887 100644
--- 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
index c14b440df8..c62bdc53d3 100644
--- 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'