Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs

2016-04-29 10:05:20 +01:00
parent 69e519052b 351b50a887
commit acded821c4
42 changed files with 1372 additions and 455 deletions
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -36,7 +36,6 @@ REQUIREMENTS = {
    "blist": ["blist"],
    "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
    "pymacaroons-pynacl": ["pymacaroons"],
-    "pyjwt": ["jwt"],
 }
 CONDITIONAL_REQUIREMENTS = {
    "web_client": {