diff options
| author | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
| commit | b4ecf0b886c67437901e0af457c5f801ebde9a72 (patch) | |
| tree | ef66b0684edcfeb4ad68d20375641f4654393f44 /synapse/replication/resource.py | |
| parent | Include the ts the notif was received at (diff) | |
| parent | Merge pull request #1003 from matrix-org/erikj/redaction_prev_content (diff) | |
| download | synapse-b4ecf0b886c67437901e0af457c5f801ebde9a72.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api
Diffstat (limited to 'synapse/replication/resource.py')
| -rw-r--r-- | synapse/replication/resource.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py index 847f212a3d..8c2d487ff4 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py @@ -16,6 +16,7 @@ from synapse.http.servlet import parse_integer, parse_string from synapse.http.server import request_handler, finish_request from synapse.replication.pusher_resource import PusherResource +from synapse.replication.presence_resource import PresenceResource from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET @@ -115,6 +116,7 @@ class ReplicationResource(Resource): self.clock = hs.get_clock() self.putChild("remove_pushers", PusherResource(hs)) + self.putChild("syncing_users", PresenceResource(hs)) def render_GET(self, request): self._async_render_GET(request) |