diff options
author | Erik Johnston <erik@matrix.org> | 2017-06-27 15:41:34 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-06-27 15:41:34 +0100 |
commit | 731f3c37a0eec2e25dfbf35b57dc4d6a3a324559 (patch) | |
tree | 99d829a2150ad93562f6e30f05631d198ea144fd /synapse | |
parent | Merge pull request #2308 from matrix-org/erikj/user_ip_repl (diff) | |
parent | Update version and changelog (diff) | |
download | synapse-731f3c37a0eec2e25dfbf35b57dc4d6a3a324559.tar.xz |
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 9df7d18993..6b0a766391 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.1" +__version__ = "0.22.0-rc1" |