summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-11 10:43:32 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-11 10:43:32 +0000
commitd6eae548a7c08836bbf51749e2877fbe5d0edf81 (patch)
tree950c093072bfbce5deed7af6c1c18c5c0442d741 /CHANGES.md
parentMerge branch 'release-v1.10.0' into matrix-org-hotfixes (diff)
parent1.10.0rc4 (diff)
downloadsynapse-d6eae548a7c08836bbf51749e2877fbe5d0edf81.tar.xz
Merge branch 'release-v1.10.0' into matrix-org-hotfixes v1.10.0rc4
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4a81a04627..f776560de7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.10.0rc4 (2020-02-11)
+==============================
+
+Features
+--------
+
+- Filter out m.room.aliases from /sync state blocks until a full fix lands. ([\#6884](https://github.com/matrix-org/synapse/issues/6884))
+
+
 Synapse 1.10.0rc3 (2020-02-10)
 ==============================