summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-09-05 21:58:19 +0100
committerRichard van der Hoff <richard@matrix.org>2017-09-05 21:58:19 +0100
commit5f59f2063675f3415193abb97cc7c60e4f8aed50 (patch)
treeb09edcaebd066774b716ea2dbf9871183dc587c3 /synapse/handlers/federation.py
parentMerge branch 'master' into develop (diff)
parentExclude the github issue template from our sdist (#2440) (diff)
downloadsynapse-5f59f2063675f3415193abb97cc7c60e4f8aed50.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/handlers/federation.py')
0 files changed, 0 insertions, 0 deletions