diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
| commit | 86a00e05e1db0fd4fa7a0192520504c229b6f79c (patch) | |
| tree | 17c0ac3804e223913549a50cfa6c5d5616824568 /synapse/config/server.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... (diff) | |
| parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
| download | synapse-86a00e05e1db0fd4fa7a0192520504c229b6f79c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 64a5121a45..2190f3210a 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -82,9 +82,9 @@ 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 + # Admin uri to direct users at should their instance become blocked # due to resource constraints - self.admin_email = config.get("admin_email", None) + self.admin_uri = config.get("admin_uri", None) # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None |