diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-22 12:33:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-22 12:33:21 +0100 |
commit | 911db96658ffd0fca79dbd19499813ca75f65518 (patch) | |
tree | cc11cbf13e9f19f47b733bb029fcc19803a61b71 /.circleci/merge_base_branch.sh | |
parent | uh, Matrix is called Matrix these days... (diff) | |
parent | Make psutil an explicit dependency (diff) | |
download | synapse-911db96658ffd0fca79dbd19499813ca75f65518.tar.xz |
Merge pull request #4073 from matrix-org/rav/require_psutil
Make psutil an explicit dependency
Diffstat (limited to '.circleci/merge_base_branch.sh')
0 files changed, 0 insertions, 0 deletions