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-17 23:53:00 +0100
committerRichard van der Hoff <richard@matrix.org>2019-04-17 23:53:00 +0100
commitf30a882cc6014678087e7fe0f6f337f9786476d6 (patch)
tree6346ed6aaa5776742965408edc3d225a54d0f69d /synapse/federation/federation_base.py
parentMerge pull request #5073 from matrix-org/babolivier/account_expiration (diff)
parentUpdate debian install docs for new key and repo (#5074) (diff)
downloadsynapse-f30a882cc6014678087e7fe0f6f337f9786476d6.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