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

2021-01-23 15:04:11 +01:00
parent c8f051a42d a56cb34850
commit 183adec3d8
156 changed files with 1764 additions and 529 deletions
--- a/setup.yml
+++ b/setup.yml
@ -37,4 +37,5 @@
    - matrix-email2matrix
    - matrix-nginx-proxy
    - matrix-coturn
+    - matrix-aux
    - matrix-common-after