summary refs log tree commit diff
path: root/synapse/config/push.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-24 15:31:36 +0100
committerErik Johnston <erik@matrix.org>2019-06-24 15:31:36 +0100
commitad2ba70959cef6055769ec4fa059cfa8675062c0 (patch)
treedefccd8b57a72433773627921f2dbb9f45ca27e2 /synapse/config/push.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5531 from matrix-org/erikj/workers_pagination_token (diff)
downloadsynapse-ad2ba70959cef6055769ec4fa059cfa8675062c0.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/push.py')
-rw-r--r--synapse/config/push.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/push.py b/synapse/config/push.py

index 62c0060c9c..99d15e4461 100644 --- a/synapse/config/push.py +++ b/synapse/config/push.py
@@ -18,7 +18,7 @@ from ._base import Config class PushConfig(Config): - def read_config(self, config): + def read_config(self, config, **kwargs): push_config = config.get("push", {}) self.push_include_content = push_config.get("include_content", True)