Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 15:06:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into matthew/preview_urls

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-04 00:38:21 +01:00
commit 9f7dc2bef7
41 changed files with 1556 additions and 990 deletions
Download patch file Download diff file Expand all files Collapse all files

1
synapse/python_dependencies.py
View file

@ -37,6 +37,7 @@ REQUIREMENTS = {
"pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
"pymacaroons-pynacl": ["pymacaroons"],
"lxml>=3.6.0": ["lxml"],
"pyjwt": ["jwt"],
}
CONDITIONAL_REQUIREMENTS = {
"web_client": {