diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-07-17 15:26:47 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-07-17 15:26:47 +0100 |
commit | 2f5dfe299cbbeb34ed686c9ee1ab14ded13f368c (patch) | |
tree | 6b91ad3e6a2b0f002e1d4f26fe229c5a5736d541 /tests/rest/client/v1/test_admin.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federation (diff) | |
download | synapse-2f5dfe299cbbeb34ed686c9ee1ab14ded13f368c.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/rest/client/v1/test_admin.py')
0 files changed, 0 insertions, 0 deletions