summary refs log tree commit diff
path: root/changelog.d/11324.feature
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-11-30 14:28:30 +0000
committerBrendan Abolivier <babolivier@matrix.org>2021-11-30 14:28:30 +0000
commitb14f8a1baf6f500997ae4c1d6a6d72094ce14270 (patch)
treea8fa755541f7e462247b1f72803dad7c8fe46028 /changelog.d/11324.feature
parentAdd missing copyright header. (#11460) (diff)
parentMerge trust_identity_server_for_password_resets PRs (diff)
downloadsynapse-b14f8a1baf6f500997ae4c1d6a6d72094ce14270.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/11324.feature')
-rw-r--r--changelog.d/11324.feature1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/11324.feature b/changelog.d/11324.feature
deleted file mode 100644
index 55494358bb..0000000000
--- a/changelog.d/11324.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add dedicated admin API for blocking a room.
\ No newline at end of file