diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-02-18 14:52:23 +0000 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2019-02-18 14:52:23 +0000 |
commit | 68a53f825fc3ecb415571bda2bfc7c1df5edefb7 (patch) | |
tree | 8f71f2a3123fe30230d798259eca391794c52d48 /synapse/federation/federation_base.py | |
parent | Typo in changelog (diff) | |
parent | Merge pull request #4643 from matrix-org/erikj/catch_exceptions (diff) | |
download | synapse-68a53f825fc3ecb415571bda2bfc7c1df5edefb7.tar.xz |
Merge branch 'develop' into babolivier/acme-delegated
Diffstat (limited to 'synapse/federation/federation_base.py')
0 files changed, 0 insertions, 0 deletions