summary refs log tree commit diff
path: root/tests/rest/client/v1/test_admin.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-17 15:26:47 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-17 15:26:47 +0100
commit2f5dfe299cbbeb34ed686c9ee1ab14ded13f368c (patch)
tree6b91ad3e6a2b0f002e1d4f26fe229c5a5736d541 /tests/rest/client/v1/test_admin.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3546 from matrix-org/rav/fix_erasure_over_federation (diff)
downloadsynapse-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