summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-18 16:22:14 +0100
committerErik Johnston <erik@matrix.org>2014-09-18 16:22:14 +0100
commite0f060d89b9ed82284e3781640fb77257d116753 (patch)
tree93010a33c66d1213c1a6285919cb9eca3f81a8e0 /synapse
parentfix wordwrap (diff)
parentBump Changelog and version (diff)
downloadsynapse-e0f060d89b9ed82284e3781640fb77257d116753.tar.xz
Merge branch 'master' 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 1b49cbb38e..0dbad9a0de 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.3.1"
+__version__ = "0.3.2"