diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-18 15:53:39 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-18 15:53:39 +0000 |
commit | 1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd (patch) | |
tree | ce7ac77b3714ccaa6d54cb30201ce5cfa2041e63 /synapse/__init__.py | |
parent | Merge pull request #384 from matrix-org/erikj/shorter_retries (diff) | |
parent | Merge branch 'hotfixes-v0.11.0-r1' (diff) | |
download | synapse-1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/__init__.py')
-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 f0eac97bab..5a83f5f3ec 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.11.0" +__version__ = "0.11.0-r1" |