summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-10-17 17:03:02 +0100
committerRichard van der Hoff <richard@matrix.org>2019-10-17 17:03:02 +0100
commit70d9759cdfe1917c8c72f99300faa4a63c6f7322 (patch)
tree167e62c01fd6ba2f8c0d06b032a53a31b0238c62
parentMerge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage (diff)
parent1.4.1rc1 (diff)
downloadsynapse-70d9759cdfe1917c8c72f99300faa4a63c6f7322.tar.xz
Merge tag 'v1.4.1rc1' into develop
Synapse 1.4.1rc1 (2019-10-17)
=============================

Bugfixes
--------

- Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
-rw-r--r--CHANGES.md8
-rw-r--r--synapse/__init__.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 165e1d4db4..ecba33bd30 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+Synapse 1.4.1rc1 (2019-10-17)
+=============================
+
+Bugfixes
+--------
+
+- Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
+
 Synapse 1.4.0 (2019-10-03)
 ==========================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 56df3f5ac6..e908b90177 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.4.0"
+__version__ = "1.4.1rc1"
 
 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