summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-27 11:07:02 +0100
committerErik Johnston <erik@matrix.org>2016-10-27 11:07:02 +0100
commitab731d8f8ecc87c56ff89b28390d25c334e5c166 (patch)
treee92500a90a23c42bf3725b70f986f433b0957696
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2 (diff)
downloadsynapse-ab731d8f8ecc87c56ff89b28390d25c334e5c166.tar.xz
Bump changelog and version
-rw-r--r--CHANGES.rst8
-rw-r--r--synapse/__init__.py2
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 4291ccc7aa..53f8ca65d9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-Changes in synapse v0.18.2-rc2 (2016-10-25)
+Changes in synapse v0.18.2-rc3 (2016-10-27)
 ===========================================
 
 Changes:
@@ -17,6 +17,12 @@ Bug fixes:
 * Fix infinite typing bug (PR #1179)
 
 
+Changes in synapse v0.18.2-rc2 (2016-10-25)
+===========================================
+
+(This release did not include the changes advertised and was identical to RC1)
+
+
 Changes in synapse v0.18.2-rc1 (2016-10-17)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index fdffbfe815..2c5dcf59f7 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-rc2"
+__version__ = "0.18.2-rc3"