Merge branch 'master' into toml/install-scripts-fail-fast

2019-04-03 15:52:11 +02:00
parent 9c41ccce58 240c715c84
commit c1464aaa5d
12 changed files with 54 additions and 66 deletions
--- a/synapse/install.sh
+++ b/synapse/install.sh
@@ -34,7 +34,7 @@ pip install --upgrade setuptools
 python synapse/python_dependencies.py | xargs pip install
 pip install lxml mock
 pip install .
-
+pip install jinja2 # We use the ConsentResource, which requires jinja2
 python -m synapse.app.homeserver \
    --server-name localhost \
    --config-path homeserver.yaml \