summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 16:21:30 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 16:21:30 +0000
commit5f68529036d7d2bd6b7e5c67250a722a10c094f2 (patch)
treed65cb2872ab8d5e7d8649025b3078acc6281598d /synapse
parentMerge branch 'hotfixes-0.7.0e' into develop (diff)
parentMerge branch 'hotfixes-0.7.0e' of github.com:matrix-org/synapse (diff)
downloadsynapse-5f68529036d7d2bd6b7e5c67250a722a10c094f2.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 7ba21cd247..1a02aefe26 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.7.0d"
+__version__ = "0.7.0e"