diff options
author | Richard van der Hoff <richard@matrix.org> | 2017-03-13 12:20:47 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2017-03-13 12:20:47 +0000 |
commit | 3c69f324024db9868bdec42a9aceb666c48d209f (patch) | |
tree | 1e09876712257aebb5fb63c41c7e9c97908ba11e /synapse/python_dependencies.py | |
parent | Move FederationServer._handle_new_pdu to FederationHandler (diff) | |
parent | Merge pull request #1983 from matrix-org/rav/no_redirect_stdio (diff) | |
download | synapse-3c69f324024db9868bdec42a9aceb666c48d209f.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu
Diffstat (limited to '')
-rw-r--r-- | synapse/python_dependencies.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c4777b2a2b..7817b0cd91 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -1,5 +1,4 @@ # Copyright 2015, 2016 OpenMarket Ltd -# Copyright 2017 Vector Creations Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -38,7 +37,6 @@ REQUIREMENTS = { "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], - "phonenumbers>=8.2.0": ["phonenumbers"], } CONDITIONAL_REQUIREMENTS = { "web_client": { |