Merge branch 'main' into old-signing-key
This commit is contained in:
commit
22cc356a56
@ -33,7 +33,7 @@ ALLOW_PUBLIC_ROOMS_FEDERATION=false
|
|||||||
ENABLE_REGISTRATION=false
|
ENABLE_REGISTRATION=false
|
||||||
PASSWORD_LOGIN_ENABLED=true
|
PASSWORD_LOGIN_ENABLED=true
|
||||||
|
|
||||||
# Token based registration. Enable ADMIN_INTERFACE_ENABLED=1 (below) to use the admin interface to generate tokens.
|
# Token based registration. Enable ADMIN_INTERFACE (below) to use the admin interface to generate tokens.
|
||||||
#REGISTRATION_REQUIRES_TOKEN=true
|
#REGISTRATION_REQUIRES_TOKEN=true
|
||||||
|
|
||||||
## Room auto-join
|
## Room auto-join
|
||||||
|
Loading…
x
Reference in New Issue
Block a user