summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-02 16:51:08 +0100
committerErik Johnston <erik@matrix.org>2019-10-02 16:51:08 +0100
commit23bb2713d2e7584fa58a12a0c8f7791a218d26fd (patch)
tree1d30a9364275d15562642fb54a5670aee791c919 /tests/utils.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #6154 from matrix-org/erikj/fix_appservice_pagination (diff)
downloadsynapse-23bb2713d2e7584fa58a12a0c8f7791a218d26fd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/utils.py')
0 files changed, 0 insertions, 0 deletions