summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-03 16:27:24 +0100
committerErik Johnston <erik@matrix.org>2016-06-03 16:27:24 +0100
commit5f88549f4a5c4832c8d2c46f299b148ad40e00b3 (patch)
treed9919f423f1917d3aea4a79e121a474ef11287ab /synapse
parentMerge pull request #831 from matrix-org/markjh/synchrotronII (diff)
parentNote that v0.15.x was never released (diff)
downloadsynapse-5f88549f4a5c4832c8d2c46f299b148ad40e00b3.tar.xz
Merge branch 'release-v0.16.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 7de51fbe8d..3b290db79f 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.16.0-rc1"