summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-12 14:21:49 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-12 14:21:49 +0000
commitdeeebbfcb71d100cee18a8a26cc288a1cf352b83 (patch)
tree2948cf78c93d74ce1618a81c10ae497360e0af83 /synapse/__init__.py
parentMerge pull request #435 from matrix-org/erikj/search (diff)
parentMerge pull request #436 from matrix-org/markjh/pip_instructions (diff)
downloadsynapse-deeebbfcb71d100cee18a8a26cc288a1cf352b83.tar.xz
Merge branch 'release-v0.12.0' 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 3e7e26bf60..c357f8f9c2 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.1"
+__version__ = "0.12.0-rc1"