summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-29 18:16:58 +0000
committerErik Johnston <erik@matrix.org>2018-10-29 18:16:58 +0000
commitf8281f42c8710d4dcefa5dd1e7e2ac93481d231e (patch)
tree4aedf75dafeff0d7c3c0a29abe6934b777f37e63 /tests/utils.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4109 from matrix-org/erikj/repl_devices (diff)
downloadsynapse-f8281f42c8710d4dcefa5dd1e7e2ac93481d231e.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