summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 13:34:25 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 13:34:25 +0000
commit6375abcdacf4ae95b8671917fc94461a2fbf884c (patch)
treea927bb6c99b99d1a23a9e6df7fb2cd21316e79c1 /synapse
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentBump version (diff)
downloadsynapse-6375abcdacf4ae95b8671917fc94461a2fbf884c.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 10147d88dc..c0aa2a757f 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.0a"
+__version__ = "0.7.0b"