kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge commit '1381cd05b' into anoa/dinsic_release_1_31_0

Browse Source
This commit is contained in:
Andrew Morgan
2021-04-23 12:22:55 +01:00
parent 2e3baa1f49 1381cd05b0
commit 5a514a3e11
46 changed files with 103 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/sample_config.yaml
View File

@@ -2408,8 +2408,8 @@ password_config:
#require_uppercase: true
ui_auth:
# The number of milliseconds to allow a user-interactive authentication
# session to be active.
# The amount of time to allow a user-interactive authentication session
# to be active.
#
# This defaults to 0, meaning the user is queried for their credentials
# before every action, but this can be overridden to allow a single
@@ -2420,7 +2420,7 @@ ui_auth:
# Uncomment below to allow for credential validation to last for 15
# seconds.
#
#session_timeout: 15000
#session_timeout: "15s"
# Configuration for sending emails from Synapse.