Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work

This commit is contained in:
Richard van der Hoff 2019-09-24 17:03:50 +01:00
commit 9b7c4f4078
7 changed files with 75 additions and 8 deletions

View file

@ -516,7 +516,7 @@ class RegistrationWorkerStore(SQLBaseStore):
)
@defer.inlineCallbacks
def get_user_id_by_threepid(self, medium, address, require_verified=False):
def get_user_id_by_threepid(self, medium, address):
"""Returns user id from threepid
Args: