summary refs log tree commit diff
path: root/tests/appservice
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-08 11:24:11 +0100
committerGitHub <noreply@github.com>2016-08-08 11:24:11 +0100
commite7674eb759645b7989f0d79eb6598a1d9929efaa (patch)
treec3189b92b1e502551a856dbd7631e373fd7f9e33 /tests/appservice
parentMerge pull request #991 from matrix-org/erikj/retry_make (diff)
parentMake psutil optional (diff)
downloadsynapse-e7674eb759645b7989f0d79eb6598a1d9929efaa.tar.xz
Merge pull request #992 from matrix-org/erikj/psutil_conditional
Make psutil optional
Diffstat (limited to 'tests/appservice')
0 files changed, 0 insertions, 0 deletions