Merge branch 'develop' into matthew/preview_urls

2016-04-04 00:38:21 +01:00
parent cf51c4120e 89e6839a48
commit 9f7dc2bef7
41 changed files with 1556 additions and 990 deletions
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -37,6 +37,7 @@ REQUIREMENTS = {
    "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
    "pymacaroons-pynacl": ["pymacaroons"],
    "lxml>=3.6.0": ["lxml"],
+    "pyjwt": ["jwt"],
 }
 CONDITIONAL_REQUIREMENTS = {
    "web_client": {