summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-15 16:24:07 +0100
committerErik Johnston <erik@matrix.org>2016-06-15 16:24:07 +0100
commit54368489559e87b7cf2564af298fa29ed9267009 (patch)
tree58f6cd42ae0f792c25524b5902a8c5c8658bf245 /synapse
parentMerge pull request #871 from matrix-org/erikj/linearize_state_fetch_on_pdu (diff)
parentUpdate change log (diff)
downloadsynapse-54368489559e87b7cf2564af298fa29ed9267009.tar.xz
Merge branch 'release-v0.16.1' 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 dc211e9637..faaa86d972 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"
+__version__ = "0.16.1-rc1"