summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-20 10:00:13 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-20 10:00:13 +0000
commitb2aeaa2dcc833430330b556453acb83b23a95650 (patch)
tree81807cc40eded2faae7bfb7f969ada5b31798642 /synapse/__init__.py
parentSYN-153: Fix formatting of federation error message (diff)
parenttypoe (diff)
downloadsynapse-b2aeaa2dcc833430330b556453acb83b23a95650.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 23ae5f003f..14564e735e 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.4.2"
+__version__ = "0.5.0"