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

synapse/config-templates/consent/homeserver.yaml

@@ -674,6 +674,7 @@ user_consent:
   block_events_error: >-
     To continue using this homeserver you must review and agree to the
     terms and conditions at %(consent_uri)s
+  require_at_registration: true
 
 
 

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 \