summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-10 09:56:51 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-10 09:56:51 +0000
commite439438b9b51ee22fc2bc19e89582c049b927701 (patch)
tree40ac73b5dfe2352229a6688d8afff2dec6515bed /CHANGES.md
parentMerge branch 'release-v1.10.0' into matrix-org-hotfixes (diff)
parent1.10.0rc3 (diff)
downloadsynapse-e439438b9b51ee22fc2bc19e89582c049b927701.tar.xz
Merge branch 'release-v1.10.0' into matrix-org-hotfixes
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md15
1 files changed, 15 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c2aa735908..4a81a04627 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+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))
+
+
+Internal Changes
+----------------
+
+- Fix continuous integration failures with old versions of `pip`, which were introduced by a release of the `zipp` library. ([\#6880](https://github.com/matrix-org/synapse/issues/6880))
+
+
 Synapse 1.10.0rc2 (2020-02-06)
 ==============================