summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-19 12:59:39 +0000
committerErik Johnston <erik@matrix.org>2019-11-19 12:59:39 +0000
commit6d1a3e2bdddae4a9202cec590f87b6ccb0489879 (patch)
treeebad42c2198d0dcb4c2164fc27366c8a094077bc /synapse/python_dependencies.py
parentMerge branch 'rav/url_preview_limit_title_2' into matrix-org-hotfixes (diff)
parentReplace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff)
downloadsynapse-6d1a3e2bdddae4a9202cec590f87b6ccb0489879.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py1
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",