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

1 files changed, 1 insertions, 1 deletions

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

index 76d9970e5b..611b598ec7 100644
--- a/synapse/config/ratelimiting.py
+++ b/synapse/config/ratelimiting.py
@@ -27,7 +27,7 @@ class RatelimitConfig(Config):
         self.federation_rc_reject_limit = config["federation_rc_reject_limit"]
         self.federation_rc_concurrent = config["federation_rc_concurrent"]
 
-    def default_config(self, config_dir_path, server_name):
+    def default_config(self, **kwargs):
         return """\
         ## Ratelimiting ##