summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-19 21:49:26 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-19 21:51:15 +0100
commite5b52d0f945962a5f4bef5e7a2fb6445dfc0d8f8 (patch)
tree8a684a1da975835ca013874dbc28ec80d7da3762 /.circleci
parentMerge branch 'rav/fix_email_templates_4065' into develop (diff)
downloadsynapse-e5b52d0f945962a5f4bef5e7a2fb6445dfc0d8f8.tar.xz
Make psutil an explicit dependency
As of #4027, we require psutil to be installed, so it should be in our
dependency list. We can also remove some of the conditional import code
introduced by #992.

Fixes #4062.
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions