summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-04 15:31:02 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-04 15:31:02 +0000
commitce8bc642ae7b0c9a2342b420e8a8177df512e517 (patch)
tree5422244592a5a9c1c9561c86b246691c9f103dcd /synapse/__init__.py
parentFix bug in store defer. Add more unit tests. (diff)
parentMerge pull request #46 from matrix-org/identicons (diff)
downloadsynapse-ce8bc642ae7b0c9a2342b420e8a8177df512e517.tar.xz
Merge branch 'develop' into application-services
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 895a0766d2..012425fa60 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.6.1b"
+__version__ = "0.6.1d"