Merge branch 'release-v0.34.0' into develop

This commit is contained in:
Richard van der Hoff 2018-12-11 15:43:20 +00:00
commit f208f608cb
43 changed files with 146 additions and 98 deletions

View file

@ -68,9 +68,6 @@ REQUIREMENTS = {
}
CONDITIONAL_REQUIREMENTS = {
"web_client": {
"matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"],
},
"email.enable_notifs": {
"Jinja2>=2.8": ["Jinja2>=2.8"],
"bleach>=1.4.2": ["bleach>=1.4.2"],