Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts

2015-07-13 13:50:57 +01:00
parent e5991af629 532fcc997a
commit 5989637f37
23 changed files with 1330 additions and 222 deletions
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -32,6 +32,7 @@ REQUIREMENTS = {
    "pydenticon": ["pydenticon"],
    "ujson": ["ujson"],
    "blist": ["blist"],
+    "pysaml2": ["saml2"],
 }
 CONDITIONAL_REQUIREMENTS = {
    "web_client": {