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

index 64644b9a7a..2fcf872449 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -60,7 +60,7 @@ class ContentRepositoryConfig(Config):
             config["thumbnail_sizes"]
         )
 
-    def default_config(self, config_dir_path, server_name):
+    def default_config(self, **kwargs):
         media_store = self.default_path("media_store")
         uploads_path = self.default_path("uploads")
         return """