mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 11:20:07 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
6840e7cece
1 changed files with 1 additions and 1 deletions
|
@ -163,7 +163,7 @@ class RegistrationHandler(BaseHandler):
|
|||
# each request
|
||||
httpCli = SimpleHttpClient(self.hs)
|
||||
# XXX: make this configurable!
|
||||
trustedIdServers = ['matrix.org:8090']
|
||||
trustedIdServers = ['matrix.org:8090', 'matrix.org']
|
||||
if not creds['idServer'] in trustedIdServers:
|
||||
logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
|
||||
'credentials', creds['idServer'])
|
||||
|
|
Loading…
Reference in a new issue