summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-19 13:11:49 +0000
committerErik Johnston <erik@matrix.org>2015-11-19 13:11:49 +0000
commitf9d9bd6aa0bce42f1529911326e0ccfd0246f35d (patch)
tree651d23f4fe9e3e94549d3b5e94f0127d8166698d /synapse/__init__.py
parentErik pointed out we should advise on the lack of included client (diff)
parentBump changes and version (diff)
downloadsynapse-f9d9bd6aa0bce42f1529911326e0ccfd0246f35d.tar.xz
Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2
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 5a83f5f3ec..7ff37edf2c 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-r1"
+__version__ = "0.11.0-r2"