summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-01-28 09:43:57 +0000
committerRichard van der Hoff <richard@matrix.org>2020-01-28 14:20:10 +0000
commitfbe0a82c0d603b12d8c1d9a2a1121dafb5616213 (patch)
tree02907b208f990efbd359555708d3795e99f04ed9
parentchangelog (diff)
downloadsynapse-fbe0a82c0d603b12d8c1d9a2a1121dafb5616213.tar.xz
update changelog
-rw-r--r--changelog.d/6787.feature1
-rw-r--r--changelog.d/6787.misc1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/6787.feature b/changelog.d/6787.feature
new file mode 100644
index 0000000000..df9e4b77ab
--- /dev/null
+++ b/changelog.d/6787.feature
@@ -0,0 +1 @@
+Implement updated authorization rules for aliases events, from [MSC2260](https://github.com/matrix-org/matrix-doc/pull/2260).
diff --git a/changelog.d/6787.misc b/changelog.d/6787.misc
deleted file mode 100644
index 82fe636173..0000000000
--- a/changelog.d/6787.misc
+++ /dev/null
@@ -1 +0,0 @@
-Implement updated auth rules from MSC2260.