summary refs log tree commit diff
path: root/synapse/federation/__init__.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-02 16:05:34 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-02 16:05:34 +0000
commita006d168c556ca71ad0bbb680c60f1ba170338fb (patch)
tree9093ead05bd4f55321dff1e4c43b3b1b7b91aad6 /synapse/federation/__init__.py
parentMerge branch 'develop' into application-services (diff)
downloadsynapse-a006d168c556ca71ad0bbb680c60f1ba170338fb.tar.xz
Actually merge into develop.
Diffstat (limited to 'synapse/federation/__init__.py')
0 files changed, 0 insertions, 0 deletions