summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-04 17:37:34 +0000
committerErik Johnston <erik@matrix.org>2015-02-04 17:37:34 +0000
commit8046df6efa5509096c3b33c292f03f80c95b6481 (patch)
tree079a9ba974f0c3b5096438ca9cd12ac38c794390 /synapse/__init__.py
parentMerge branch 'signature_failures' of github.com:matrix-org/synapse into feder... (diff)
parentMore s/instance_handle/profile_tag/ (diff)
downloadsynapse-8046df6efa5509096c3b33c292f03f80c95b6481.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
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"