summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-07 10:03:48 +0100
committerErik Johnston <erik@matrix.org>2017-04-07 10:03:48 +0100
commita41fe500d6ea975e628a4ba6aa14997592af9843 (patch)
tree37cfc1014bde48882d78c7d091bcb5be90cf0f6d
parentMerge pull request #2094 from matrix-org/rav/fix_federation_join (diff)
downloadsynapse-a41fe500d6ea975e628a4ba6aa14997592af9843.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 6659c6671a..61512db418 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.20.0 (2017-04-07)
+=======================================
+
+Bug fixes:
+
+* Fix joining rooms over federation where not all servers in the room saw the
+  new server had joined (PR #2094)
+
+
 Changes in synapse v0.20.0-rc1 (2017-03-30)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 580927abf4..2e5f4e0ead 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.20.0-rc1"
+__version__ = "0.20.0"