Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston
2015-02-11 10:20:43 +00:00
+1 -1
View File
@@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.6.1d"
__version__ = "0.6.1f"