summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-03 15:02:04 +0100
committerErik Johnston <erik@matrix.org>2016-06-03 15:02:04 +0100
commitfcbc282f56ac90829c4e3627b1fe48915ee24c64 (patch)
tree22f826f307aa56811c5924a66af4a4cef7e6fb3b /synapse/__init__.py
parentFix typo (diff)
parentBump changelog and version (diff)
downloadsynapse-fcbc282f56ac90829c4e3627b1fe48915ee24c64.tar.xz
Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into release-v0.16.0
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 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"