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/handlers/identity.py b/synapse/handlers/identity.py

index c05036ad1f..f61844d688 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -476,8 +476,6 @@ class IdentityHandler(BaseHandler):
         except RequestTimedOutError:
             raise SynapseError(500, "Timed out contacting identity server")
 
-        assert self.hs.config.public_baseurl
-
         # we need to tell the client to send the token back to us, since it doesn't
         # otherwise know where to send it, so add submit_url response parameter
         # (see also MSC2078)