diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
commit | d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1 (patch) | |
tree | 15032c3b14c0c9e3e52db8cd5fa4a04d985f034e /synapse/config/registration.py | |
parent | Use if `is not None` (diff) | |
parent | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... (diff) | |
download | synapse-d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips
Diffstat (limited to 'synapse/config/registration.py')
-rw-r--r-- | synapse/config/registration.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index d4654e99b3..bef89e2bf4 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -293,6 +293,8 @@ class RegistrationConfig(Config): # by the Matrix Identity Service API specification: # https://matrix.org/docs/spec/identity_service/latest # + # If a delegate is specified, the config option public_baseurl must also be filled out. + # account_threepid_delegates: #email: https://example.com # Delegate email sending to example.org #msisdn: http://localhost:8090 # Delegate SMS sending to this local process |