summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-16 17:29:49 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-16 17:29:49 +0000
commit56db465047c2906a78eccdd63b2fa18d72903a66 (patch)
treebdd082c04fd0c02b4d732bf8ea6e4dd559d84b51 /synapse/__init__.py
parentSYN-142: Use a default log file 'homeserver.log' so people get logging by def... (diff)
parentChange upgrade script to not check hashes or signatures (diff)
downloadsynapse-56db465047c2906a78eccdd63b2fa18d72903a66.tar.xz
Merge branch 'release-v0.6.0' 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 7e49e1fd08..1cef40925f 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.5.4a"
+__version__ = "0.6.0"