Merge branch 'master' into develop

2026-04-17 15:09:31 +02:00 · 2025-01-10 14:37:19 +00:00
parent ee2073a8e3 4757edc796
commit 26c93c8fb2
3 changed files with 10 additions and 2 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+## Changes in 1.11.23 (2025-01-10)
+
+🙌 Improvements
+
+- Show sunset banners, guiding users to install Element X when registering a new account against a server with MAS. ([#7889](https://github.com/element-hq/element-ios/issues/7889))
+
+⚠️ API Changes
+
+- Adds a BuildSettings.replacementApp setting, used to control the sunset banners. ([#7889](https://github.com/element-hq/element-ios/issues/7889))
+
 ## Changes in 1.11.22 (2024-12-10)

 🐛 Bugfixes
--- a/changelog.d/7889.api
+++ b/changelog.d/7889.api
@@ -1 +0,0 @@
-Adds a BuildSettings.replacementApp setting, used to control the sunset banners.
--- a/changelog.d/7889.change
+++ b/changelog.d/7889.change
@@ -1 +0,0 @@
-Show sunset banners, guiding users to install Element X when registering a new account against a server with MAS.
				`@@ -1 +0,0 @@`
				`Adds a BuildSettings.replacementApp setting, used to control the sunset banners.`
				`@@ -1 +0,0 @@`
				`Show sunset banners, guiding users to install Element X when registering a new account against a server with MAS.`