summary refs log tree commit diff
path: root/synapse/federation/__init__.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-11-03 12:58:57 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-11-03 12:58:57 +0000
commit71a452a324e45c338c6d91e6b17b92712157367c (patch)
tree2f95a26c9c8ff024c855ed7a8ca674e833dddca8 /synapse/federation/__init__.py
parentmore comment (diff)
parentfix tests (diff)
downloadsynapse-71a452a324e45c338c6d91e6b17b92712157367c.tar.xz
Merge branch 'dinsic' into matthew/shadow-server
Diffstat (limited to 'synapse/federation/__init__.py')
0 files changed, 0 insertions, 0 deletions