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 11:12:31 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-11 11:12:31 +0000
commit88d41e94f5aeacdfdb415d9c50dcbc433f72945e (patch)
tree1b956a88660c888e70cb0442f0e4cdeb2bd42acd /CHANGES.md
parentMerge branch 'release-v1.10.0' into develop (diff)
parent1.10.0rc5 (diff)
downloadsynapse-88d41e94f5aeacdfdb415d9c50dcbc433f72945e.tar.xz
Merge branch 'release-v1.10.0' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md12
1 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index f776560de7..1995a70b19 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,15 @@
-Synapse 1.10.0rc4 (2020-02-11)
+Synapse 1.10.0rc5 (2020-02-11)
 ==============================
 
-Features
+Bugfixes
 --------
 
-- Filter out m.room.aliases from /sync state blocks until a full fix lands. ([\#6884](https://github.com/matrix-org/synapse/issues/6884))
+- Fix the filtering introduced in 1.10.0rc3 to also apply to the state blocks returned by `/sync`. ([\#6884](https://github.com/matrix-org/synapse/issues/6884))
+
+Synapse 1.10.0rc4 (2020-02-11)
+==============================
 
+This release candidate was built incorrectly and is superceded by 1.10.0rc5.
 
 Synapse 1.10.0rc3 (2020-02-10)
 ==============================
@@ -13,7 +17,7 @@ Synapse 1.10.0rc3 (2020-02-10)
 Features
 --------
 
-- Filter out m.room.aliases from the CS API to mitigate abuse while a better solution is specced. ([\#6878](https://github.com/matrix-org/synapse/issues/6878))
+- Filter out `m.room.aliases` from the CS API to mitigate abuse while a better solution is specced. ([\#6878](https://github.com/matrix-org/synapse/issues/6878))
 
 
 Internal Changes