diff options
author | Erik Johnston <erik@matrix.org> | 2016-06-03 15:02:04 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-06-03 15:02:04 +0100 |
commit | fcbc282f56ac90829c4e3627b1fe48915ee24c64 (patch) | |
tree | 22f826f307aa56811c5924a66af4a4cef7e6fb3b /synapse | |
parent | Fix typo (diff) | |
parent | Bump changelog and version (diff) | |
download | synapse-fcbc282f56ac90829c4e3627b1fe48915ee24c64.tar.xz |
Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into release-v0.16.0
Diffstat (limited to 'synapse')
-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 7de51fbe8d..988318f5ea 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.14.0" +__version__ = "0.15.0-rc1" |