summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-16 10:18:02 +0000
committerErik Johnston <erik@matrix.org>2016-12-16 10:18:02 +0000
commitb9b6d17ab1c503eb7d140623ed9c5cc37162e5a8 (patch)
treefce7147d9b4422f76b5cec8b53312bb34932d84f
parentMerge pull request #1704 from matrix-org/rav/log_todevice_syncs (diff)
downloadsynapse-b9b6d17ab1c503eb7d140623ed9c5cc37162e5a8.tar.xz
Bump version and changelog
-rw-r--r--CHANGES.rst9
-rw-r--r--synapse/__init__.py2
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 414732ac28..aafd61ab4a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.18.5 (2016-12-16)
+=======================================
+
+Bug fixes:
+
+* Fix federation /backfill returning events it shouldn't (PR #1700)
+* Fix crash in url preview (PR #1701)
+
+
 Changes in synapse v0.18.5-rc3 (2016-12-13)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 825e90a2da..f006e10dc5 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-rc3"
+__version__ = "0.18.5"