summary refs log tree commit diff
path: root/synapse/app/frontend_proxy.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-03-13 22:11:58 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-03-13 22:11:58 +0000
commit12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0 (patch)
tree1db11e8ee3cd835de2c8d33aaf9534573d0ac357 /synapse/app/frontend_proxy.py
parentensure we always include the members for a given timeline block (diff)
parenttypoe (diff)
downloadsynapse-12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0.tar.xz
merge proper fix to bug 2969
Diffstat (limited to 'synapse/app/frontend_proxy.py')
-rw-r--r--synapse/app/frontend_proxy.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py

index e32ee8fe93..816c080d18 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py
@@ -211,7 +211,6 @@ def start(config_options): ) ss.setup() - ss.get_handlers() ss.start_listening(config.worker_listeners) def start():