summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-09-26 11:00:26 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-09-26 11:00:26 +0100
commit2e0d2879d0770572de72b1e90ba5055a1a5972e3 (patch)
tree85ae5ed62b1ad7b8b9698fad6d28db7970a029ce /synapse/app/pusher.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3 (diff)
downloadsynapse-2e0d2879d0770572de72b1e90ba5055a1a5972e3.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py

index 244c604de9..2ec4c7defb 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py
@@ -228,7 +228,6 @@ def start(config_options): def start(): ps.get_pusherpool().start() ps.get_datastore().start_profiling() - ps.get_state_handler().start_caching() reactor.callWhenRunning(start)