summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-07-06 13:57:45 +0100
committerErik Johnston <erik@matrix.org>2017-07-06 13:57:45 +0100
commit1f64207f266d99cacdb98f1afdda6d091ecec354 (patch)
treea6b657fc4b8a7700d90182fe9b5266ee6ef5dac2 /synapse
parentMerge pull request #2334 from matrix-org/erikj/refactor_transport_server (diff)
parentMerge branch 'release-v0.22.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-1f64207f266d99cacdb98f1afdda6d091ecec354.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6b0a766391..60af1cbecd 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.22.0-rc1"
+__version__ = "0.22.0"