summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--changelog.d/5196.feature1
-rw-r--r--docs/sample_config.yaml6
2 files changed, 7 insertions, 0 deletions
diff --git a/changelog.d/5196.feature b/changelog.d/5196.feature
new file mode 100644

index 0000000000..1ffb928f62 --- /dev/null +++ b/changelog.d/5196.feature
@@ -0,0 +1 @@ +Add an option to disable per-room profiles. 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 ##