summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:35:13 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:35:13 +0000
commit5758dafb4e8c28ed3a19b352798bac7e3ff619e3 (patch)
treef6427195438c7e1e076ee4a0124f403a5ad26b1a /synapse/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentFix bug where variable was not always defined (diff)
downloadsynapse-5758dafb4e8c28ed3a19b352798bac7e3ff619e3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
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 012425fa60..8fe8df4edb 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.1d"
+__version__ = "0.6.1f"