summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-08 09:43:01 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-08 09:43:01 +0000
commitf3467d4646e05c0d5d057e0652ad12ce6d63bc77 (patch)
tree73e2f3622fb5c6e8613085f12bb867525394b0e4 /synapse/__init__.py
parentMerge branch 'release-v0.6.1' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-f3467d4646e05c0d5d057e0652ad12ce6d63bc77.tar.xz
Merge branch 'hotfixes-v0.6.1' v0.6.1a
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 c3f1ac63be..2195ad3177 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.6.1"
+__version__ = "0.6.1a"