summary refs log tree commit diff
path: root/synapse/federation/federation_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-04-25 17:09:04 +0100
committerRichard van der Hoff <richard@matrix.org>2019-04-25 17:09:04 +0100
commitce6d47934bf7e615327b32d58afd84abb7da9e8a (patch)
treea478c322626e151cca4d2638dd9146ed85c082ca /synapse/federation/federation_base.py
parentMerge pull request #5098 from matrix-org/rav/fix_pep_517 (diff)
parentadd gpg key fingerprint (diff)
downloadsynapse-ce6d47934bf7e615327b32d58afd84abb7da9e8a.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/federation/federation_base.py')
0 files changed, 0 insertions, 0 deletions