summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-28 14:56:32 +0100
committerErik Johnston <erik@matrix.org>2016-07-28 14:56:32 +0100
commit5fb41a955c9cf35fd25f92b39f58489dd77fb37e (patch)
tree2b90c7e1f54550a3af8c84e41f4b6cb9b8bb2bb1 /synapse/__init__.py
parentMerge pull request #962 from matrix-org/markjh/retry (diff)
parentAdd authors to changelog (diff)
downloadsynapse-5fb41a955c9cf35fd25f92b39f58489dd77fb37e.tar.xz
Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop
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 2750ad3f7a..8f0176e182 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.1-r1"
+__version__ = "0.17.0-rc1"