summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-07 14:55:06 +0000
committerErik Johnston <erik@matrix.org>2015-01-07 14:55:06 +0000
commitcc7a267a85eb3341cef5313010ac195e166f2c0f (patch)
tree27510a6358b8bc219ccd456622b963a3b394bee3 /synapse
parentRemove unused import (diff)
parentImprove change log (diff)
downloadsynapse-cc7a267a85eb3341cef5313010ac195e166f2c0f.tar.xz
Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 06167e3c1a..c3f1ac63be 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.0"
+__version__ = "0.6.1"