diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:53:13 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:53:13 +0100 |
commit | 4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88 (patch) | |
tree | 7780de5531566372372992521f2476551a51be73 /synapse/config/registration.py | |
parent | Review comments (diff) | |
parent | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips (diff) | |
download | synapse-4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2
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 |