summary refs log tree commit diff
path: root/tests/rest/client/v1/test_rooms.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-23 16:09:40 +0100
committerErik Johnston <erik@matrix.org>2018-07-23 16:09:40 +0100
commitb136d7ff8ff2017148bd0ee52d7065c304b0ef0f (patch)
tree9cfd9af91b170993385b2460392adc563731270e /tests/rest/client/v1/test_rooms.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3581 from matrix-org/erikj/fixup_stateless (diff)
downloadsynapse-b136d7ff8ff2017148bd0ee52d7065c304b0ef0f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/rest/client/v1/test_rooms.py')
0 files changed, 0 insertions, 0 deletions