diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-17 12:10:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-17 12:10:49 +0100 |
commit | fdeac1e984a79ccc45a0b7e04c0c3072bac1e1b9 (patch) | |
tree | 6aee4b8a2725c269b880408a3043d0368cc1c5c0 /docs/sample_config.yaml | |
parent | Fix image orientation when generating thumbnail (#5039) (diff) | |
parent | Lint (diff) | |
download | synapse-fdeac1e984a79ccc45a0b7e04c0c3072bac1e1b9.tar.xz |
Merge pull request #5196 from matrix-org/babolivier/per_room_profiles
Add an option to disable per-room profiles
Diffstat (limited to 'docs/sample_config.yaml')
-rw-r--r-- | docs/sample_config.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 09ee0e8984..d218aefee5 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -276,6 +276,12 @@ listeners: # #require_membership_for_aliases: false +# Whether to allow per-room membership profiles through the send of membership +# events with profile information that differ from the target's global profile. +# Defaults to 'true'. +# +#allow_per_room_profiles: false + ## TLS ## |