diff options
author | Erik Johnston <erik@matrix.org> | 2018-07-12 09:59:58 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-07-12 09:59:58 +0100 |
commit | 7c79f2cb7234b259ed2654da3c19fba7015d45ba (patch) | |
tree | e3c87fdcf0d31c6ac24316ca8fd54a5abe0472a4 /tests/rest/client/v1/test_admin.py | |
parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3505 from matrix-org/erikj/receipts_cahce (diff) | |
download | synapse-7c79f2cb7234b259ed2654da3c19fba7015d45ba.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