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:48 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-08 09:43:48 +0000
commit8ac9199f56b9472be450d7d605f454eccb8f2e50 (patch)
tree1155f31341e2a6add943ae5a9e65e695d3b475b5 /synapse/__init__.py
parentLog server version on startup (diff)
parentMerge branch 'hotfixes-v0.6.1' (diff)
downloadsynapse-8ac9199f56b9472be450d7d605f454eccb8f2e50.tar.xz
Merge branch 'master' 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 9bfa09edfd..4d5d70d265 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.6.1"
+__version__ = "0.6.1a"