diff options
| author | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
| commit | cb03fafdf150cb97d494c1a12efb730e01309fb2 (patch) | |
| tree | 5c6994f2ec826599984d7a621caeb889aeef4c57 /synapse/config/server.py | |
| parent | Register the 3pid servlet (diff) | |
| parent | Filter typing nofication events to only those rooms the requesting user is a ... (diff) | |
| download | synapse-cb03fafdf150cb97d494c1a12efb730e01309fb2.tar.xz | |
Merge branch 'develop' into csauth
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 58a828cc4c..d4c223f348 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -110,7 +110,7 @@ class ServerConfig(Config): with open(args.signing_key_path, "w") as signing_key_file: syutil.crypto.signing_key.write_signing_keys( signing_key_file, - (syutil.crypto.signing_key.generate_singing_key("auto"),), + (syutil.crypto.signing_key.generate_signing_key("auto"),), ) else: signing_keys = cls.read_file(args.signing_key_path, "signing_key") |