Merge branch 'anoa/reg_email_account_threepid_delegate' of github.com:matrix-org/synapse into anoa/reg_email_account_threepid_delegate

* 'anoa/reg_email_account_threepid_delegate' of github.com:matrix-org/synapse:
  Update synapse/handlers/identity.py
  Update synapse/handlers/identity.py
  Update synapse/config/emailconfig.py

Author: anoadragon453

synapse/handlers/identity.py

@@ -226,12 +226,14 @@ def requestEmailToken(self, email, client_secret, send_attempt, next_link=None,
         """
         Request an external server send an email on our behalf for the purposes of threepid
         validation.
+
         Args:
             email (str): The email to send the message to
             client_secret (str): The unique client_secret sends by the user
             send_attempt (int): Which attempt this is
             next_link: A link to redirect the user to once they submit the token
             kwargs: extra arguments to send to the server
+
         Returns:
             The json response body from the server
         """