summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-18 11:38:24 +0100
committerErik Johnston <erik@matrix.org>2016-05-18 11:38:24 +0100
commit5941346c5b8b0847a0adc643e80ba6ba8669c149 (patch)
tree0f7bd386246268177ca45ee4b6ddd992b333e085 /synapse/replication/resource.py
parentCorrectly order recents (diff)
parentAdd desc to get_presence_for_users (diff)
downloadsynapse-5941346c5b8b0847a0adc643e80ba6ba8669c149.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync
Diffstat (limited to 'synapse/replication/resource.py')
-rw-r--r--synapse/replication/resource.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py

index 0e983ae7fa..847f212a3d 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py
@@ -109,8 +109,8 @@ class ReplicationResource(Resource): self.version_string = hs.version_string self.store = hs.get_datastore() self.sources = hs.get_event_sources() - self.presence_handler = hs.get_handlers().presence_handler - self.typing_handler = hs.get_handlers().typing_notification_handler + self.presence_handler = hs.get_presence_handler() + self.typing_handler = hs.get_typing_handler() self.notifier = hs.notifier self.clock = hs.get_clock()