summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-08-03 15:31:21 +0100
committerDavid Baker <dave@matrix.org>2015-08-03 15:31:21 +0100
commit28d07a02e42c90732b708de870af2f9b21ba13f0 (patch)
tree8ce901964ae3a034a5e5bf219185706303739f74
parentMerge pull request #210 from matrix-org/reg-v2a-password-skip (diff)
downloadsynapse-28d07a02e42c90732b708de870af2f9b21ba13f0.tar.xz
Add vector.im as trusted ID server
Diffstat (limited to '')
-rw-r--r--synapse/handlers/identity.py2
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']