diff options
| author | Ben Banfield-Zanin <benbz@matrix.org> | 2020-04-30 08:24:15 +0100 |
|---|---|---|
| committer | Ben Banfield-Zanin <benbz@matrix.org> | 2020-04-30 08:24:15 +0100 |
| commit | 80c66c4bca3ba494ab1ae194640b647bf95effb1 (patch) | |
| tree | bb0266d950f5dc49d6501a43406973dada4a80a9 /docs | |
| parent | 1.12.4 (diff) | |
| parent | Improve error message (diff) | |
| download | synapse-80c66c4bca3ba494ab1ae194640b647bf95effb1.tar.xz | |
Merge remote-tracking branch 'origin/babolivier/info_mainline' into bbz/info-mainline2 github/bbz/info-mainline2 bbz/info-mainline2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 2ff0dd05a2..bf1ec4ece9 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -974,6 +974,11 @@ account_validity: # Mandate that users are only allowed to associate certain formats of # 3PIDs with accounts on this server. # +# Use an Identity Server to establish which 3PIDs are allowed to register? +# Overrides allowed_local_3pids below. +# +#check_is_for_allowed_local_3pids: matrix.org +# #allowed_local_3pids: # - medium: email # pattern: '.*@matrix\.org' |