summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-20 16:06:28 +0000
committerErik Johnston <erik@matrix.org>2015-02-20 16:06:28 +0000
commit7367ca42b597f9863819a5dd9fb628273ce71614 (patch)
tree119fb440d82356a352ec007ee0dc09e948a9ce5f /synapse/__init__.py
parentMerge pull request #84 from matrix-org/disable_registration (diff)
parentMerge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse (diff)
downloadsynapse-7367ca42b597f9863819a5dd9fb628273ce71614.tar.xz
Merge branch 'master' 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 a804a25748..f8ec4b0459 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.7.1"
+__version__ = "0.7.1-r1"