summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-13 11:32:53 +0000
committerGitHub <noreply@github.com>2019-12-13 11:32:53 +0000
commit5cadbd9ebb6cc9e6e2e15ab3f77fcbca47d53392 (patch)
tree811fec2b55d1566cc294de5747842d615932b8d4 /synapse/config/server.py
parentMerge branch 'master' into develop (diff)
parentNewsfile (diff)
downloadsynapse-5cadbd9ebb6cc9e6e2e15ab3f77fcbca47d53392.tar.xz
Merge pull request #6537 from matrix-org/erikj/bump_mypy_version
Bump mypy version
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index a4bef00936..50af858c76 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -200,7 +200,7 @@ class ServerConfig(Config):
         self.admin_contact = config.get("admin_contact", None)
 
         # FIXME: federation_domain_whitelist needs sytests
-        self.federation_domain_whitelist = None
+        self.federation_domain_whitelist = None  # type: Optional[dict]
         federation_domain_whitelist = config.get("federation_domain_whitelist", None)
 
         if federation_domain_whitelist is not None: