summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2023-08-22 16:47:59 +0200
committerGitHub <noreply@github.com>2023-08-22 14:47:59 +0000
commit0ba17777be81ba9457defb407112b664042a14d2 (patch)
tree3eea0de6202c4686023bce0c08691eb9c9f90342 /changelog.d
parentAdd an admin endpoint to allow authorizing server to signal token revocations... (diff)
downloadsynapse-0ba17777be81ba9457defb407112b664042a14d2.tar.xz
Disable `m.3pid_changes` capability when MSC3861 is enabled. (#16134)
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/16127.bugfix2
-rw-r--r--changelog.d/16134.bugfix1
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/16127.bugfix b/changelog.d/16127.bugfix
index 0308fdfd45..9ce5f4a705 100644
--- a/changelog.d/16127.bugfix
+++ b/changelog.d/16127.bugfix
@@ -1 +1 @@
-User consent features cannot be enabled when using experimental MSC3861.
+User constent and 3-PID changes capability cannot be enabled when using experimental [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) support.
diff --git a/changelog.d/16134.bugfix b/changelog.d/16134.bugfix
new file mode 100644
index 0000000000..9ce5f4a705
--- /dev/null
+++ b/changelog.d/16134.bugfix
@@ -0,0 +1 @@
+User constent and 3-PID changes capability cannot be enabled when using experimental [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) support.