summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/6884.feature1
-rw-r--r--synapse/__init__.py2
3 files changed, 10 insertions, 2 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)
 ==============================
 
diff --git a/changelog.d/6884.feature b/changelog.d/6884.feature
deleted file mode 100644
index 4f6b9630b8..0000000000
--- a/changelog.d/6884.feature
+++ /dev/null
@@ -1 +0,0 @@
-Filter out m.room.aliases from /sync state blocks until a full fix lands.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 36c0cf557a..cc69ff0c41 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.10.0rc3"
+__version__ = "1.10.0rc4"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when