summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-11 18:35:16 +0000
committerErik Johnston <erik@matrix.org>2015-11-11 18:35:16 +0000
commit884e601683adf11d8ff8b0fb6bb34188524bf5c5 (patch)
tree150e39eaed6280868736efb50f036f72e8033570 /synapse
parentMerge pull request #361 from matrix-org/daniel/guestcontext (diff)
parentUpdate date (diff)
downloadsynapse-884e601683adf11d8ff8b0fb6bb34188524bf5c5.tar.xz
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e9ce0412ed..f68a15bb85 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.10.1-rc1"
+__version__ = "0.11.0-rc1"