summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-02 17:10:26 +0100
committerErik Johnston <erik@matrix.org>2016-08-02 17:10:26 +0100
commit49e047c55ed76977afb2ee227d6052ed28166983 (patch)
treeef8574602adf71095a34bce48a98b9d2da2e7fbd
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 (diff)
downloadsynapse-49e047c55ed76977afb2ee227d6052ed28166983.tar.xz
Bump version and changelog v0.17.0-rc3
-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 cacf4b8947..d1c0a1b76a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-Changes in synapse v0.17.0-rc2 (2016-08-02)
+Changes in synapse v0.17.0-rc3 (2016-08-02)
 ===========================================
 
 Changes:
@@ -15,6 +15,12 @@ Bug fixes:
 * Fix adding emails on registration (PR #968)
 
 
+Changes in synapse v0.17.0-rc2 (2016-08-02)
+===========================================
+
+(This release did not include the changes advertised and was identical to RC1)
+
+
 Changes in synapse v0.17.0-rc1 (2016-07-28)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 9899944977..67231e8d97 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.17.0-rc2"
+__version__ = "0.17.0-rc3"