summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-27 14:52:47 +0100
committerErik Johnston <erik@matrix.org>2016-10-27 14:52:47 +0100
commit665e53524e36d7830467e914c270a4c6bd457596 (patch)
tree04e4bc5cdf7ad83732df60681c0505407ce00d15
parentMerge pull request #1183 from matrix-org/erikj/fix_email_update (diff)
downloadsynapse-665e53524e36d7830467e914c270a4c6bd457596.tar.xz
Bump changelog and version v0.18.2-rc4
-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 3abd4d2b6b..61f14a2c34 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.18.2-rc4 (2016-10-27)
+===========================================
+
+Bug fixes:
+
+* Fix ``user_threepids`` schema delta, which in some instances prevented
+  startup after upgrade (PR #1183)
+
+
 Changes in synapse v0.18.2-rc3 (2016-10-27)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2c5dcf59f7..81c9f3c238 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-rc3"
+__version__ = "0.18.2-rc4"