summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-20 17:25:42 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-20 17:25:42 +0100
commitf483340b3e20ab19129f9c0ae6b0a1395d8ef762 (patch)
tree3097406bf9bcae62e0d3c2d16476bb525764a59d /synapse/python_dependencies.py
parentMerge remote-tracking branch 'origin/master' into develop (diff)
parentRemove incorrect whitespace (diff)
downloadsynapse-f483340b3e20ab19129f9c0ae6b0a1395d8ef762.tar.xz
Merge pull request #229 from matrix-org/auth
Issue macaroons as opaque auth tokens
Diffstat (limited to '')
-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 01fc4ea1e5..a87fdeb2a0 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -33,6 +33,7 @@ REQUIREMENTS = { "ujson": ["ujson"], "blist": ["blist"], "pysaml2": ["saml2"], + "pymacaroons-pynacl": ["pymacaroons"], } CONDITIONAL_REQUIREMENTS = { "web_client": {