diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-04 18:09:50 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-04 18:09:50 +0000 |
| commit | e252ffadbc1df609d9455e0bfbc68dfe5cd146ee (patch) | |
| tree | d52bb449ff87f53597a92ceccf8b5079f520c6eb /synapse/python_dependencies.py | |
| parent | Print out the actual number of affected rows (diff) | |
| parent | Remove the psutil dependency (#6318) (diff) | |
| download | synapse-e252ffadbc1df609d9455e0bfbc68dfe5cd146ee.tar.xz | |
Merge branch 'develop' into babolivier/msc2326_bg_update
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", |