diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-06 12:14:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-06 12:14:01 +0100 |
| commit | 323cfe3efb433d4d34d3fe428935692b55984145 (patch) | |
| tree | ed3e76050f72caf951dfe053b21517db4f3902af /tests/test_server.py | |
| parent | Merge branch 'rav/cross_signing_keys_cache' into matrix-org-hotfixes (diff) | |
| download | synapse-323cfe3efb433d4d34d3fe428935692b55984145.tar.xz | |
fix bad merge
Diffstat (limited to 'tests/test_server.py')
0 files changed, 0 insertions, 0 deletions