summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-01 13:06:36 +0000
committerErik Johnston <erik@matrix.org>2016-11-01 13:06:36 +0000
commit3c91c5b2162d4697f4e12c06ec779765293ab682 (patch)
treef5d146248431ce35f1ad810267024af4eb907bdf
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2 (diff)
downloadsynapse-3c91c5b2162d4697f4e12c06ec779765293ab682.tar.xz
Bump version and changelog
-rw-r--r--CHANGES.rst6
-rw-r--r--synapse/__init__.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 4f952eecc4..371f26eb6e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in synapse v0.18.2 (2016-11-01)
+=======================================
+
+No changes since v0.18.2-rc5
+
+
 Changes in synapse v0.18.2-rc5 (2016-10-28)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7ae1459562..4e2a592d3d 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.2-rc5"
+__version__ = "0.18.2"