diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-12 14:21:49 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-12 14:21:49 +0000 |
commit | deeebbfcb71d100cee18a8a26cc288a1cf352b83 (patch) | |
tree | 2948cf78c93d74ce1618a81c10ae497360e0af83 /synapse/__init__.py | |
parent | Merge pull request #435 from matrix-org/erikj/search (diff) | |
parent | Merge pull request #436 from matrix-org/markjh/pip_instructions (diff) | |
download | synapse-deeebbfcb71d100cee18a8a26cc288a1cf352b83.tar.xz |
Merge branch 'release-v0.12.0' 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 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" |