diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-04-17 23:53:00 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-04-17 23:53:00 +0100 |
commit | f30a882cc6014678087e7fe0f6f337f9786476d6 (patch) | |
tree | 6346ed6aaa5776742965408edc3d225a54d0f69d /synapse/federation/federation_base.py | |
parent | Merge pull request #5073 from matrix-org/babolivier/account_expiration (diff) | |
parent | Update debian install docs for new key and repo (#5074) (diff) | |
download | synapse-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