summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-31 17:50:06 +0000
committerErik Johnston <erik@matrix.org>2014-10-31 17:50:06 +0000
commit36d730229a694159399c2fca8876a4f0722a66e8 (patch)
treeaa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse
parentSYWEB-102: Fix desktop notification msg when a user with no display name join... (diff)
parentBump version numbers and change log (diff)
downloadsynapse-36d730229a694159399c2fca8876a4f0722a66e8.tar.xz
Merge branch 'release-v0.4.2' 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 7067188c5b..23ae5f003f 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.1"
+__version__ = "0.4.2"