summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-15 16:35:34 +0100
committerErik Johnston <erik@matrix.org>2015-09-15 16:35:34 +0100
commit1107e83b5429e2465bcd52952154ba1ad01acd54 (patch)
tree1e0af30cdf60e92faafb1cd6f903dc9c06ccd607 /synapse
parentMerge pull request #280 from matrix-org/paul/sighup (diff)
parentBump version/changelog (diff)
downloadsynapse-1107e83b5429e2465bcd52952154ba1ad01acd54.tar.xz
Merge branch 'master' 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 d85bb3dce0..5b5ff6c3f3 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.10.0"
+__version__ = "0.10.0-r1"