Merge branch 'master' into element-call-integration

This commit is contained in:
Slavi Pantaleev 2025-03-12 06:36:48 +02:00
commit 8eb1c57e2b

View File

@ -468,10 +468,3 @@ matrix_static_files_self_check_hostname_identity: ''
# As per the spec (https://matrix.org/docs/spec/client_server/r0.6.0#well-known-uri), it shouldn't be, # As per the spec (https://matrix.org/docs/spec/client_server/r0.6.0#well-known-uri), it shouldn't be,
# so we default to not following redirects as well. # so we default to not following redirects as well.
matrix_static_files_self_check_well_known_matrix_client_follow_redirects: none matrix_static_files_self_check_well_known_matrix_client_follow_redirects: none
# TODO - review this one
# Specifies where requests for the root URI (`/`) on the `matrix.` domain should be redirected.
# If this has an empty value, they're just passed to the homeserver, which serves a static page.
# If you'd like to make `https://matrix.example.com` redirect to `https://element.example.com` (or something of that sort), specify the domain name here.
# Example value: `element.example.com` (or `{{ matrix_server_fqn_element }}`).
matrix_static_files_client_redirect_root_uri_to_domain: ""