summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-12 15:24:06 +0000
committerErik Johnston <erik@matrix.org>2015-02-12 15:24:06 +0000
commit92d850fc874aa5c77659adb6b5d38a99f989f0b5 (patch)
tree64f05ff96a9a1bb60374ea803d921f5256903e51 /synapse/__init__.py
parentMerge branch 'release-v0.7.0' of github.com:matrix-org/synapse (diff)
parentMerge pull request #69 from matrix-org/hotfixes-v0.7.0a (diff)
downloadsynapse-92d850fc874aa5c77659adb6b5d38a99f989f0b5.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 915af3fe09..10147d88dc 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.0"
+__version__ = "0.7.0a"