diff options
| author | David Baker <dave@matrix.org> | 2015-01-28 16:03:35 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-28 16:03:35 +0000 |
| commit | 6840e7ceced60e2b71f6e2ee3df6ba201000332b (patch) | |
| tree | 20c5fbb04af37045cd70a70197414943d87d0578 /synapse | |
| parent | Move pushers delta to v12 and bump schema version (diff) | |
| parent | Add matrix.org as a trusted ID server because it's now passed through on port... (diff) | |
| download | synapse-6840e7ceced60e2b71f6e2ee3df6ba201000332b.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/register.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 732652c228..66a89c10b2 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -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']) |