summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorhera <matrix@template.upcloud.com>2018-06-28 21:09:28 +0000
committerhera <matrix@template.upcloud.com>2018-06-28 21:09:28 +0000
commit82781f5838c4fd152fe2698bc6a757ff3a200dbb (patch)
treed4f779c1189f1367a2809d9f4aeb61e2f9998243 /tests/utils.py
parentMerge remote-tracking branch 'origin/revert-3451-hawkowl/sorteddict-api' into... (diff)
parentMerge pull request #3465 from matrix-org/matthew/as_ip_lock (diff)
downloadsynapse-82781f5838c4fd152fe2698bc6a757ff3a200dbb.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/utils.py')
0 files changed, 0 insertions, 0 deletions