summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-16 13:57:27 +0000
committerErik Johnston <erik@matrix.org>2014-12-16 13:57:27 +0000
commit96cc7c87405e87aacc2318f4634e1c6e5e2f46d3 (patch)
tree1140305729d39de603589984245c407451c35b0f
parentMerge pull request #25 from matrix-org/events_refactor (diff)
downloadsynapse-96cc7c87405e87aacc2318f4634e1c6e5e2f46d3.tar.xz
Bump version
Diffstat (limited to '')
-rw-r--r--VERSION2
-rw-r--r--synapse/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 64c6e2f460..a918a2aa18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.4a
+0.6.0
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"