diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:07:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:21:14 +0100 |
| commit | 998a72d4d9ec6e73000888dcdf51437ec427fbee (patch) | |
| tree | f8fa9d5deb820b49eb3a216e194ee83e14fb9eda /synapse/python_dependencies.py | |
| parent | Bump the version of twisted needed for setup_requires to 15.2.1 (diff) | |
| parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
| download | synapse-998a72d4d9ec6e73000888dcdf51437ec427fbee.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/http/matrixfederationclient.py
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c76e16c28b..534c4a6698 100644 --- 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": { |