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/appservice.py b/synapse/config/appservice.py

index 38f41933b7..b8d301995e 100644
--- a/synapse/config/appservice.py
+++ b/synapse/config/appservice.py
@@ -20,7 +20,7 @@ class AppServiceConfig(Config):
     def read_config(self, config):
         self.app_service_config_files = config.get("app_service_config_files", [])
 
-    def default_config(cls, config_dir_path, server_name):
+    def default_config(cls, **kwargs):
         return """\
         # A list of application service config file to use
         app_service_config_files: []