diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-02-26 14:05:40 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-02-26 14:05:40 +0000 |
| commit | fdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8 (patch) | |
| tree | 4e2e1bdc58f6f77d7856e56261ace9b0218bb9f6 /synapse/config/server.py | |
| parent | Revert "Redirect redirect requests if they arrive on the wrong URI" (diff) | |
| parent | SSO: redirect to public URL before setting cookies (#9436) (diff) | |
| download | synapse-fdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8.tar.xz | |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 0bfd4398e2..2afca36e7d 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -397,7 +397,6 @@ class ServerConfig(Config): if self.public_baseurl is not None: if self.public_baseurl[-1] != "/": self.public_baseurl += "/" - self.start_pushers = config.get("start_pushers", True) # (undocumented) option for torturing the worker-mode replication a bit, # for testing. The value defines the number of milliseconds to pause before |