summary refs log tree commit diff
path: root/synapse/replication/presence_resource.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-02 12:52:51 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-02 12:52:51 +0100
commita6ab7305b97f6863422a95a7a23940fbb09345a8 (patch)
tree4069fb3c2ecc10bd450128005b95ddcbde30f016 /synapse/replication/presence_resource.py
parentProd the main synapse with the list of syncing users (diff)
parentFixes (diff)
downloadsynapse-a6ab7305b97f6863422a95a7a23940fbb09345a8.tar.xz
Merge branch 'markjh/external_presence' into markjh/synchrotron
Diffstat (limited to 'synapse/replication/presence_resource.py')
-rw-r--r--synapse/replication/presence_resource.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/replication/presence_resource.py b/synapse/replication/presence_resource.py

index 5a1b1a8dae..fc18130ab4 100644 --- a/synapse/replication/presence_resource.py +++ b/synapse/replication/presence_resource.py
@@ -37,6 +37,7 @@ class PresenceResource(Resource): Resource.__init__(self) # Resource is old-style, so no super() self.version_string = hs.version_string + self.clock = hs.get_clock() self.presence_handler = hs.get_presence_handler() def render_POST(self, request):