summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-08 17:35:11 +0100
committerErik Johnston <erik@matrix.org>2017-05-08 17:35:11 +0100
commitca238bc0233c8262c6ba62ace06fb6891603cb8e (patch)
treeb2a02b458679b02327a19a40557695379b1fa67f /synapse
parentMerge pull request #2203 from matrix-org/erikj/event_cache_hit_ratio (diff)
parentBump version and changelog (diff)
downloadsynapse-ca238bc0233c8262c6ba62ace06fb6891603cb8e.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 2e5f4e0ead..d4ad23fa3d 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"
+__version__ = "0.21.0-rc2"