Merge branch 'develop' into markjh/twisted-15

Conflicts: synapse/http/matrixfederationclient.py
2015-08-12 17:07:22 +01:00
parent 66da8f60d0 4f11a5b2b5
commit 998a72d4d9
96 changed files with 4528 additions and 1677 deletions
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -31,6 +31,8 @@ REQUIREMENTS = {
    "pillow": ["PIL"],
    "pydenticon": ["pydenticon"],
    "ujson": ["ujson"],
+    "blist": ["blist"],
+    "pysaml2": ["saml2"],
 }
 CONDITIONAL_REQUIREMENTS = {
    "web_client": {