From 3857de2194e3b2057c4af71e095eb6759508f25f Mon Sep 17 00:00:00 2001
From: lugino-emeritus <lugino-emeritus@users.noreply.github.com>
Date: Tue, 28 Jul 2020 14:41:44 +0200
Subject: Option to allow server admins to join complex rooms (#7902)

Fixes #7901.

Signed-off-by: Niklas Tittjung <nik_t.01@web.de>
---
 docs/sample_config.yaml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs')

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'.
 #
-- 
cgit 1.4.1