Merge branch 'master' into develop

2015-01-28 16:03:35 +00:00 · 2015-01-28 16:03:35 +00:00 · 6840e7cece
parent 60b143a52e e32ded7b3e
commit 6840e7cece
1 changed files with 1 additions and 1 deletions
--- 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'])