summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-18 13:56:37 +0100
committerErik Johnston <erik@matrix.org>2017-05-18 13:56:37 +0100
commitf33df307324e0134635430a1a2d9c7c45e68cbb5 (patch)
treea0435aae03628d325a9b4ed82d0c74eb053afc61 /synapse
parentMerge pull request #2177 from matrix-org/erikj/faster_push_rules (diff)
parentMerge branch 'release-v0.21.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-f33df307324e0134635430a1a2d9c7c45e68cbb5.tar.xz
Merge branch 'master' 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 c39dde913f..2a40bab3f0 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-rc3"
+__version__ = "0.21.0"