diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
commit | 870c00e278a8156cf67f8c916c39215ef2333b56 (patch) | |
tree | 6a3fb77c7d8b1c2f9d919e1aa3b91de8a61567ab /synapse/handlers/auth.py | |
parent | newsfile (diff) | |
parent | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff) | |
download | synapse-870c00e278a8156cf67f8c916c39215ef2333b56.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/event_auth/4
Diffstat (limited to 'synapse/handlers/auth.py')
-rw-r--r-- | synapse/handlers/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 7a0f54ca24..c9d0db4823 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -223,7 +223,7 @@ class AuthHandler(BaseHandler): # could continue registration from your phone having clicked the # email auth link on there). It's probably too open to abuse # because it lets unauthenticated clients store arbitrary objects - # on a home server. + # on a homeserver. # Revisit: Assumimg the REST APIs do sensible validation, the data # isn't arbintrary. session["clientdict"] = clientdict @@ -810,7 +810,7 @@ class AuthHandler(BaseHandler): @defer.inlineCallbacks def add_threepid(self, user_id, medium, address, validated_at): # 'Canonicalise' email addresses down to lower case. - # We've now moving towards the Home Server being the entity that + # We've now moving towards the homeserver being the entity that # is responsible for validating threepids used for resetting passwords # on accounts, so in future Synapse will gain knowledge of specific # types (mediums) of threepid. For now, we still use the existing |