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

index a03e55c223..4d12d49857 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -117,7 +117,7 @@ class ServerConfig(Config):
 
         self.content_addr = content_addr
 
-    def default_config(self, config_dir_path, server_name):
+    def default_config(self, server_name, **kwargs):
         if ":" in server_name:
             bind_port = int(server_name.split(":")[1])
             unsecure_port = bind_port - 400