summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-09-06 13:08:22 -0400
committerPatrick Cloke <patrickc@matrix.org>2023-09-06 13:08:22 -0400
commit32fb264120f36bdcd47598457d8a2eb10a3f7a5e (patch)
treeb256b054994eda9e63e27cf1c7b4fd1dab01af37 /changelog.d
parentApply missed suggestions from the review of #16090. (#16263) (diff)
parentAdd back newsfile from #16258. (diff)
downloadsynapse-32fb264120f36bdcd47598457d8a2eb10a3f7a5e.tar.xz
Merge remote-tracking branch 'origin/release-v1.92' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/16255.misc1
-rw-r--r--changelog.d/16258.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/16255.misc b/changelog.d/16255.misc
new file mode 100644
index 0000000000..94d6aff1d6
--- /dev/null
+++ b/changelog.d/16255.misc
@@ -0,0 +1 @@
+Fix incorrect docstring for `Ratelimiter`.
diff --git a/changelog.d/16258.bugfix b/changelog.d/16258.bugfix
new file mode 100644
index 0000000000..d5ae2399e6
--- /dev/null
+++ b/changelog.d/16258.bugfix
@@ -0,0 +1 @@
+Revert [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) introspection cache, admin impersonation and account lock.