Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py

index 94916f3a49..48976e17b1 100644
--- a/synapse/config/consent_config.py
+++ b/synapse/config/consent_config.py
@@ -73,8 +73,8 @@ DEFAULT_CONFIG = """\
 
 
 class ConsentConfig(Config):
-    def __init__(self):
-        super(ConsentConfig, self).__init__()
+    def __init__(self, *args):
+        super(ConsentConfig, self).__init__(*args)
 
         self.user_consent_version = None
         self.user_consent_template_dir = None