summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-18 15:53:39 +0000
committerErik Johnston <erik@matrix.org>2015-11-18 15:53:39 +0000
commit1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd (patch)
treece7ac77b3714ccaa6d54cb30201ce5cfa2041e63 /synapse/__init__.py
parentMerge pull request #384 from matrix-org/erikj/shorter_retries (diff)
parentMerge branch 'hotfixes-v0.11.0-r1' (diff)
downloadsynapse-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__.py2
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"