summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-19 18:00:37 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-19 18:00:37 +0000
commitfa87b96ad245aa1d7289c1c3b95c9fe6ef9d98bf (patch)
tree09905f96b7da920a940484bb816c607613eab057 /synapse/config/server.py
parent1.7.0 (diff)
parentMerge pull request #6537 from matrix-org/erikj/bump_mypy_version (diff)
downloadsynapse-fa87b96ad245aa1d7289c1c3b95c9fe6ef9d98bf.tar.xz
Merge pull request #6537 from matrix-org/erikj/bump_mypy_version
* commit '5cadbd9eb':
  More rewording of changelog.
  Reword changelog
  Add deprecation notes
  Newsfile
  Bump version of mypy
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 f73f2e8f55..3a8e920bf0 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -206,7 +206,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: