summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-20 15:40:59 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-20 15:40:59 +0000
commit2765c80376bbebc18c0a818d0f454109e67e7b74 (patch)
treea9ada8b94cda9b58bcd3e3f76d22b0c5a9b66530 /synapse/federation/federation_client.py
parentMerge pull request #5752 from matrix-org/erikj/forgotten_user (diff)
parentMerge pull request #5774 from matrix-org/erikj/fix_rejected_membership (diff)
downloadsynapse-2765c80376bbebc18c0a818d0f454109e67e7b74.tar.xz
Merge pull request #5774 from matrix-org/erikj/fix_rejected_membership
Diffstat (limited to 'synapse/federation/federation_client.py')
0 files changed, 0 insertions, 0 deletions