summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-17 13:28:46 +0100
committerErik Johnston <erik@matrix.org>2017-05-17 13:28:46 +0100
commit9f430fa07f4bb88ae276efa366195e9282caa60d (patch)
tree2a79c0d5452e31174ad46541f8a906ff4939f669 /synapse
parentMerge pull request #2229 from matrix-org/erikj/faster_get_joined (diff)
parentUpdate changelog (diff)
downloadsynapse-9f430fa07f4bb88ae276efa366195e9282caa60d.tar.xz
Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d4ad23fa3d..c39dde913f 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.21.0-rc2"
+__version__ = "0.21.0-rc3"