diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-25 11:38:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-25 11:38:28 +0100 |
| commit | a14665bde7730872627e956860be0d727a53e26d (patch) | |
| tree | eeb44967874a737bd2492b6591966a389de1aeda /synapse/config/database.py | |
| parent | Bundle in some room state in the unsigned bit of the invite when sending to i... (diff) | |
| parent | Merge pull request #289 from matrix-org/markjh/fix_sql (diff) | |
| download | synapse-a14665bde7730872627e956860be0d727a53e26d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
Diffstat (limited to 'synapse/config/database.py')
| -rw-r--r-- | synapse/config/database.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py index f0611e8884..baeda8f300 100644 --- a/synapse/config/database.py +++ b/synapse/config/database.py @@ -45,7 +45,7 @@ class DatabaseConfig(Config): self.set_databasepath(config.get("database_path")) - def default_config(self, config, config_dir_path): + def default_config(self, **kwargs): database_path = self.abspath("homeserver.db") return """\ # Database configuration |