diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-16 15:11:37 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-05-16 15:11:37 +0100 |
| commit | a5fe16c5a7cbff5106524791f2d7ab621ca13bb1 (patch) | |
| tree | 78232f00c30bab136be04e29cb8a9b1e606ba969 | |
| parent | Forgot copyright (diff) | |
| download | synapse-a5fe16c5a7cbff5106524791f2d7ab621ca13bb1.tar.xz | |
Changelog + sample config
| -rw-r--r-- | changelog.d/5196.feature | 1 | ||||
| -rw-r--r-- | docs/sample_config.yaml | 6 |
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 ## |