summary refs log tree commit diff
path: root/synapse/handlers/identity.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-01-21 16:05:34 +0000
committerErik Johnston <erik@matrix.org>2021-01-21 16:05:34 +0000
commitbde75f5f6600ff74f3fa5d9ff62bcb9f56596886 (patch)
treeff8afa873b562774f386a2168fc77d3ea17e8533 /synapse/handlers/identity.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentAdd schema update to fix existing DBs affected by #9193 (#9195) (diff)
downloadsynapse-bde75f5f6600ff74f3fa5d9ff62bcb9f56596886.tar.xz
Merge remote-tracking branch 'origin/release-v1.26.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/identity.py')
-rw-r--r--synapse/handlers/identity.py2
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)