diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
| commit | 425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch) | |
| tree | 7bdebcc130261183a7d3864f56857e7006df3454 /synapse/rest/client/v2_alpha/sync.py | |
| parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
| parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
| download | synapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz | |
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 60d3dc4030..812abe22b1 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -83,7 +83,7 @@ class SyncRestServlet(RestServlet): self.sync_handler = hs.get_handlers().sync_handler self.clock = hs.get_clock() self.filtering = hs.get_filtering() - self.presence_handler = hs.get_handlers().presence_handler + self.presence_handler = hs.get_presence_handler() @defer.inlineCallbacks def on_GET(self, request): |