summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-23 14:36:00 +0000
committerErik Johnston <erik@matrix.org>2015-02-23 14:36:00 +0000
commite25e0f4da9ac04aab6bcaacef3d2950963f673da (patch)
tree4cfd61797f83c9ef7c6c3328faad52797560f313 /synapse/__init__.py
parentRevert get_auth_chain changes (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-e25e0f4da9ac04aab6bcaacef3d2950963f673da.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
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"