diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-13 18:06:18 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-13 18:06:18 +0100 |
| commit | ce7de9ae6b74e8e5e89ff442bc29f8cd73328042 (patch) | |
| tree | 31fff38e9be8ffb8d4407b02cdf9a07247a11f1b /synapse/config/server.py | |
| parent | support admin_email config and pass through into blocking errors, return Auth... (diff) | |
| download | synapse-ce7de9ae6b74e8e5e89ff442bc29f8cd73328042.tar.xz | |
Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"
This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6.
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 64a5121a45..3b078d72ca 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -82,10 +82,6 @@ class ServerConfig(Config): self.hs_disabled = config.get("hs_disabled", False) self.hs_disabled_message = config.get("hs_disabled_message", "") - # Admin email to direct users at should their instance become blocked - # due to resource constraints - self.admin_email = config.get("admin_email", None) - # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None federation_domain_whitelist = config.get( |