Marcel Partap 4678c5d7bd 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:26:08 +01:00
..
conf.d	Merge remote-tracking branch 'origin/master' into synapse-workers	2020-11-11 21:26:08 +01:00
matrix-synapse-metrics-htpasswd.j2	Fix indentation in templates	2019-05-07 21:23:35 +02:00
nginx.conf.j2	Fix indentation in templates	2019-05-07 21:23:35 +02:00