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/federation.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/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 3d4197ed69..66852153c4 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -97,9 +97,9 @@ class FederationHandler(BaseHandler): """Handles events that originated from federation. Responsible for: a) handling received Pdus before handing them on as Events to the rest - of the home server (including auth and state conflict resoultion) + of the homeserver (including auth and state conflict resoultion) b) converting events that were produced by local clients that may need - to be sent to remote home servers. + to be sent to remote homeservers. c) doing the necessary dances to invite remote users and join remote rooms. """ |