summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-13 13:50:57 +0100
committerErik Johnston <erik@matrix.org>2015-07-13 13:50:57 +0100
commit5989637f37b127f2a0c55ef0b1085ebd0d2928c1 (patch)
tree0480f8a77111f35aede6622e7ff0ed8329b6a6dd /synapse/python_dependencies.py
parentComments (diff)
parentMerge pull request #196 from matrix-org/erikj/room_history (diff)
downloadsynapse-5989637f37b127f2a0c55ef0b1085ebd0d2928c1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index daaa61b5f2..115bee8c41 100644 --- 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": {