diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
| commit | 89dda613153c4869f3c9ce96f5cbc47f93f54723 (patch) | |
| tree | 320e718965e5e843fe3950bd8c19cf4b9ad367a6 /synapse/python_dependencies.py | |
| parent | 0.27.3 (diff) | |
| parent | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff) | |
| download | synapse-89dda613153c4869f3c9ce96f5cbc47f93f54723.tar.xz | |
Merge branch 'develop' into release-v0.27.0
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 91179ce532..40eedb63cb 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,7 +34,6 @@ REQUIREMENTS = { "bcrypt": ["bcrypt>=3.1.0"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], - "ujson": ["ujson"], "blist": ["blist"], "pysaml2>=3.0.0": ["saml2>=3.0.0"], "pymacaroons-pynacl": ["pymacaroons"], |