summary refs log tree commit diff
path: root/tests/rest/client/v1/test_rooms.py
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2019-07-26 21:35:42 +1000
committerAmber H. Brown <hawkowl@atleastfornow.net>2019-07-26 21:35:42 +1000
commit8d9a56e0a6fc9fcf2bb9fdcf2ffd02ed06a5004d (patch)
treec1447febc3581a6f6e2c91ce3dd962dadae2f9e3 /tests/rest/client/v1/test_rooms.py
parentfix merging forward (diff)
parentMerge tag 'v1.2.1' into shhs (diff)
downloadsynapse-github/shhs.tar.xz
Merge branch 'shhs' of ssh://github.com/matrix-org/synapse into shhs shhs-v1.2.1.1 github/shhs shhs
Diffstat (limited to 'tests/rest/client/v1/test_rooms.py')
0 files changed, 0 insertions, 0 deletions