summary refs log tree commit diff
path: root/tests/rest/client/v1/test_admin.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-17 11:18:39 +0100
committerErik Johnston <erik@matrix.org>2018-07-17 11:18:39 +0100
commite4eec87c6a020ef43246b7df9adca5ecbcee1383 (patch)
tree35790106fdff37e7cc1a0ca9dd3fa17aff1ef2eb /tests/rest/client/v1/test_admin.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3544 from matrix-org/erikj/fixup_stream_cache (diff)
downloadsynapse-e4eec87c6a020ef43246b7df9adca5ecbcee1383.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/rest/client/v1/test_admin.py')
0 files changed, 0 insertions, 0 deletions