summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-18 14:52:19 +0100
committerErik Johnston <erik@matrix.org>2014-09-18 14:52:19 +0100
commit79a5fb469b58ea0561a917117cd471d6cd8761df (patch)
tree2cdfba70dd998a6fae20af8cfee440f809ce357c /synapse
parentMerge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop (diff)
parentBump changelog and versions (diff)
downloadsynapse-79a5fb469b58ea0561a917117cd471d6cd8761df.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 8ef176ea6f..1b49cbb38e 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.0"
+__version__ = "0.3.1"