diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
commit | b16cd18a86a530d955d38bbdbc03daa0d70a2f9b (patch) | |
tree | 8a2e6eb451ec5121affe2afc13ce95ab6fcc4bfd /synapse/handlers/identity.py | |
parent | Doc-string for config ultility function (diff) | |
parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
download | synapse-b16cd18a86a530d955d38bbdbc03daa0d70a2f9b.tar.xz |
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
Diffstat (limited to 'synapse/handlers/identity.py')
-rw-r--r-- | synapse/handlers/identity.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 6200e10775..c1095708a0 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -44,7 +44,7 @@ class IdentityHandler(BaseHandler): http_client = SimpleHttpClient(self.hs) # XXX: make this configurable! # trustedIdServers = ['matrix.org', 'localhost:8090'] - trustedIdServers = ['matrix.org'] + trustedIdServers = ['matrix.org', 'vector.im'] if 'id_server' in creds: id_server = creds['id_server'] |