diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
| commit | 9e937c28ee2013d01716a4647ddb8df34c7ec3cd (patch) | |
| tree | ddb7c3a62227bfa760b9c9c8fcd78359f4bc4636 /synapse/python_dependencies.py | |
| parent | Don't restrict the tests to v1 rooms (diff) | |
| parent | Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... (diff) | |
| download | synapse-9e937c28ee2013d01716a4647ddb8df34c7ec3cd.tar.xz | |
Merge branch 'develop' into babolivier/message_retention
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index aa7da1c543..5871feaafd 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -61,7 +61,6 @@ REQUIREMENTS = [ "bcrypt>=3.1.0", "pillow>=4.3.0", "sortedcontainers>=1.4.4", - "psutil>=2.0.0", "pymacaroons>=0.13.0", "msgpack>=0.5.2", "phonenumbers>=8.2.0", |