summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-25 15:55:54 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-25 15:55:54 +0200
commitfe18882bb5759133b8921b74d29d4a1906a69655 (patch)
treebfb3ff30c09f50e0e8458eaff698d8509bf23496 /changelog.d
parentMerge branch 'develop' into jaywink/admin-forward-extremities (diff)
parentMerge tag 'v1.26.0rc2' into develop (diff)
downloadsynapse-fe18882bb5759133b8921b74d29d4a1906a69655.tar.xz
Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/9165.bugfix1
-rw-r--r--changelog.d/9189.misc1
-rw-r--r--changelog.d/9193.bugfix1
-rw-r--r--changelog.d/9195.bugfix1
4 files changed, 1 insertions, 3 deletions
diff --git a/changelog.d/9165.bugfix b/changelog.d/9165.bugfix
new file mode 100644
index 0000000000..58db22f484
--- /dev/null
+++ b/changelog.d/9165.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug where invalid data could cause errors when calculating the presentable room name for push.
diff --git a/changelog.d/9189.misc b/changelog.d/9189.misc
deleted file mode 100644
index 9a5740aac2..0000000000
--- a/changelog.d/9189.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add an `oidc-` prefix to any `idp_id`s which are given in the `oidc_providers` configuration.
diff --git a/changelog.d/9193.bugfix b/changelog.d/9193.bugfix
deleted file mode 100644
index 5233ffc3e7..0000000000
--- a/changelog.d/9193.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix receipts or account data not being sent down sync. Introduced in v1.26.0rc1.
diff --git a/changelog.d/9195.bugfix b/changelog.d/9195.bugfix
deleted file mode 100644
index 5233ffc3e7..0000000000
--- a/changelog.d/9195.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix receipts or account data not being sent down sync. Introduced in v1.26.0rc1.