diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-02 10:33:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-02 10:33:49 +0100 |
| commit | d5e081c7ae4c1669d7f1b1280a893bc80c0ae72a (patch) | |
| tree | 4458974456c631386c7acd699b15a9f51779f0b2 /synapse/config/key.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable (diff) | |
| parent | Merge pull request #283 from matrix-org/erikj/atomic_join_federation (diff) | |
| download | synapse-d5e081c7ae4c1669d7f1b1280a893bc80c0ae72a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 23ac8a3fca..2c187065e5 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -40,7 +40,7 @@ class KeyConfig(Config): config["perspectives"] ) - def default_config(self, config_dir_path, server_name): + def default_config(self, config_dir_path, server_name, **kwargs): base_key_name = os.path.join(config_dir_path, server_name) return """\ ## Signing Keys ## |