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

Also, replace vague FIXME by a proper NOTE on the complete story of the user_dir endpoints..
2020-11-11 21:23:37 +01:00
parent 5598a89ad5 4dbec2470f
commit 4678c5d7bd
28 changed files with 453 additions and 45 deletions
--- a/setup.yml
+++ b/setup.yml
@ -5,6 +5,7 @@

  roles:
    - matrix-base
+    - matrix-dynamic-dns
    - matrix-mailer
    - matrix-postgres
    - matrix-redis