From e7f5e8a845c02d090406789842af341eb763ae93 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Wed, 22 May 2024 19:11:47 +0200
Subject: [PATCH] Update changelog

---
 TCHAP_CHANGES.md        | 12 ++++++++++++
 changelog.d/1047.misc   |  1 -
 changelog.d/1049.bugfix |  1 -
 towncrier.toml          |  2 +-
 vector-app/build.gradle |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1047.misc
 delete mode 100644 changelog.d/1049.bugfix

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index 52bbf21734..8e300a6c8d 100644
--- 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
deleted file mode 100644
index bc6e61eef6..0000000000
--- a/changelog.d/1047.misc
+++ /dev/null
@@ -1 +0,0 @@
-Suppression du variant sans VoIP.
\ No newline at end of file
diff --git a/changelog.d/1049.bugfix b/changelog.d/1049.bugfix
deleted file mode 100644
index 20be5adcce..0000000000
--- a/changelog.d/1049.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ajout d'une exception de sécurité pour le domaine openmaptiles.github.io
\ No newline at end of file
diff --git a/towncrier.toml b/towncrier.toml
index 2269978d6e..558b719f8d 100644
--- 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
index 7e3264abb7..af841c8220 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 = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'