summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-09-15 15:42:44 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-09-15 15:42:44 +0100
commit9fc0aad567254efe82bc9093f5eb07e0a991356b (patch)
tree74649ee09434e392809ab63b80a621a78f49d40e /synapse/__init__.py
parentMerge branch 'daniel/insecureclient' into develop (diff)
parentBump version/changelog (diff)
downloadsynapse-9fc0aad567254efe82bc9093f5eb07e0a991356b.tar.xz
Merge branch 'master' into daniel/insecureclient
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 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"