Merge remote-tracking branch 'origin/master' into synapse-workers

Sync with upstream
This commit is contained in:
Marcel Partap
2021-01-08 20:58:23 +01:00
170 changed files with 3476 additions and 839 deletions

View File

@ -17,7 +17,7 @@
- import_tasks: "{{ role_path }}/tasks/import_media_store.yml"
when: run_synapse_import_media_store|bool
tags:
- import-media-store
- import-synapse-media-store
- import_tasks: "{{ role_path }}/tasks/register_user.yml"
when: run_synapse_register_user|bool