summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-07-25 16:09:45 -0600
committerGitHub <noreply@github.com>2018-07-25 16:09:45 -0600
commita4fe9d2d3664d7f3760ec23ca512d711376010aa (patch)
treeb47d9fd97b8421412d922b4b2bb9d38725f3636e /synapse
parentMerge pull request #3603 from matrix-org/erikj/handle_outliers (diff)
parentCreate 3609.misc (diff)
downloadsynapse-a4fe9d2d3664d7f3760ec23ca512d711376010aa.tar.xz
Merge pull request #3609 from matrix-org/travis/doc-typo-2
Fix a minor documentation typo in on_make_leave
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 145c1a21d4..49068c06d9 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1279,7 +1279,7 @@ class FederationHandler(BaseHandler):
     @log_function
     def on_make_leave_request(self, room_id, user_id):
         """ We've received a /make_leave/ request, so we create a partial
-        join event for the room and return that. We do *not* persist or
+        leave event for the room and return that. We do *not* persist or
         process it until the other server has signed it and sent it back.
         """
         builder = self.event_builder_factory.new({