Merge branch 'develop' into travis/intentional-timeout github/travis/intentional-timeout travis/intentional-timeout

1 files changed, 3 insertions, 1 deletions

diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml

index 1b0f655d26..d5074be6dd 100644
--- a/docker/conf/homeserver.yaml
+++ b/docker/conf/homeserver.yaml
@@ -150,10 +150,12 @@ enable_group_creation: true
 
 # The list of identity servers trusted to verify third party
 # identifiers by this server.
+#
+# Also defines the ID server which will be called when an account is
+# deactivated (one will be picked arbitrarily).
 trusted_third_party_id_servers:
     - matrix.org
     - vector.im
-    - riot.im
 
 ## Metrics ###