diff options
| author | Erik Johnston <erik@matrix.org> | 2018-07-30 09:56:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-07-30 09:56:18 +0100 |
| commit | 143f1a2532e4a583c4f4f215334800cb63a4117f (patch) | |
| tree | 2926318407e42844fcf70211f6596ccab919b184 /synapse/handlers/federation.py | |
| parent | Newsfile (diff) | |
| parent | make /context lazyload & filter aware (#3567) (diff) | |
| download | synapse-143f1a2532e4a583c4f4f215334800cb63a4117f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_store
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 06700d5038..617452be6c 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1233,7 +1233,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({ |