diff options
| author | David Baker <dave@matrix.org> | 2015-01-22 17:46:16 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-22 17:46:16 +0000 |
| commit | 5c6189ea3eb36409c57cd269a8931dda8f30e6ec (patch) | |
| tree | 6a6217c76e23359e2edcebd1020b4807f18b3073 /synapse/handlers/_base.py | |
| parent | Oops: second part of commit dc938606 (diff) | |
| parent | Merge pull request #30 from matrix-org/client_api_restructure (diff) | |
| download | synapse-5c6189ea3eb36409c57cd269a8931dda8f30e6ec.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/rest/__init__.py
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 38af034b4d..f33d17a31e 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -144,7 +144,5 @@ class BaseHandler(object): yield self.notifier.on_new_room_event(event, extra_users=extra_users) yield federation_handler.handle_new_event( - event, - None, - destinations=destinations, + event, destinations=destinations, ) |