diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
| commit | 6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e (patch) | |
| tree | c0e82ece8dd47bdd3d0d142953d8b494c0b40023 /synapse/rest/well_known.py | |
| parent | Reword confusing sentence in CHANGES. (diff) | |
| parent | Give `public_baseurl` a default value (#9159) (diff) | |
| download | synapse-6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e.tar.xz | |
Merge remote-tracking branch 'origin/develop' into release-v1.26.0
Diffstat (limited to 'synapse/rest/well_known.py')
| -rw-r--r-- | synapse/rest/well_known.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/rest/well_known.py b/synapse/rest/well_known.py index f591cc6c5c..241fe746d9 100644 --- a/synapse/rest/well_known.py +++ b/synapse/rest/well_known.py @@ -34,10 +34,6 @@ class WellKnownBuilder: self._config = hs.config def get_well_known(self): - # if we don't have a public_baseurl, we can't help much here. - if self._config.public_baseurl is None: - return None - result = {"m.homeserver": {"base_url": self._config.public_baseurl}} if self._config.default_identity_server: |