diff options
author | lugino-emeritus <lugino-emeritus@users.noreply.github.com> | 2020-07-28 14:41:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-28 13:41:44 +0100 |
commit | 3857de2194e3b2057c4af71e095eb6759508f25f (patch) | |
tree | 3acf01753d0132a93955218e37c87d259bd9a59c /docs | |
parent | Merge tag 'v1.18.0rc2' into develop (diff) | |
download | synapse-3857de2194e3b2057c4af71e095eb6759508f25f.tar.xz |
Option to allow server admins to join complex rooms (#7902)
Fixes #7901. Signed-off-by: Niklas Tittjung <nik_t.01@web.de>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/sample_config.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 3227294e0b..09a7299871 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -314,6 +314,10 @@ limit_remote_rooms: # #complexity_error: "This room is too complex." + # allow server admins to join complex rooms. Default is false. + # + #admins_can_join: true + # Whether to require a user to be in the room to add an alias to it. # Defaults to 'true'. # |