summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-08 16:26:26 +0100
committerErik Johnston <erik@matrix.org>2016-06-08 16:26:26 +0100
commit919a2c74f631c250e080a3a54e53f13cfdff3bee (patch)
tree7bfcefb5cd7612d5434545950bc2d3ae862693d8 /synapse
parentMerge pull request #857 from matrix-org/erikj/default_visibility (diff)
parentUpdate commit hash in changelog (diff)
downloadsynapse-919a2c74f631c250e080a3a54e53f13cfdff3bee.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 3b290db79f..ad088a7880 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.16.0-rc1"
+__version__ = "0.16.0-rc2"