summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-24 12:29:58 +0000
committerErik Johnston <erik@matrix.org>2016-11-24 12:29:58 +0000
commit7e03f9a484c1d746285b5d6c2a34e1711c0654f2 (patch)
tree6b551a8de85549d5ac7663cfd332bcc10ab64799
parentDon't send old events as federation (diff)
downloadsynapse-7e03f9a484c1d746285b5d6c2a34e1711c0654f2.tar.xz
Bump version and changelog v0.18.5-rc2
-rw-r--r--CHANGES.rst7
-rw-r--r--synapse/__init__.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index a54de9d563..18d78e28e2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse v0.18.5-rc2 (2016-11-24)
+===========================================
+
+Bug fixes:
+
+* Don't send old events over federation, fixes bug in -rc1.
+
 Changes in synapse v0.18.5-rc1 (2016-11-24)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d0b9679858..f32c28be02 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.18.5-rc1"
+__version__ = "0.18.5-rc2"