Merge tag 'v1.26.0rc2' into travis/fosdem/hotfixes github/travis/fosdem/hotfixes travis/fosdem/hotfixes

1 files changed, 0 insertions, 2 deletions

diff --git a/synapse/api/urls.py b/synapse/api/urls.py

index 6379c86dde..e36aeef31f 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -42,8 +42,6 @@ class ConsentURIBuilder:
         """
         if hs_config.form_secret is None:
             raise ConfigError("form_secret not set in config")
-        if hs_config.public_baseurl is None:
-            raise ConfigError("public_baseurl not set in config")
 
         self._hmac_secret = hs_config.form_secret.encode("utf-8")
         self._public_baseurl = hs_config.public_baseurl