diff options
author | Erik Johnston <erik@matrix.org> | 2016-07-06 14:50:22 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-07-06 14:50:22 +0100 |
commit | eef7778af979827ee7e16b7402529780cc424c57 (patch) | |
tree | 13dbf63f60d8bc66a826566299e8201d936238fd /synapse | |
parent | Merge branch 'erikj/shared_secret' into erikj/test2 (diff) | |
parent | Merge pull request #909 from matrix-org/erikj/shared_secret (diff) | |
download | synapse-eef7778af979827ee7e16b7402529780cc424c57.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/config/password.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/password.py b/synapse/config/password.py index 66f0d93eea..a4bd171399 100644 --- a/synapse/config/password.py +++ b/synapse/config/password.py @@ -30,7 +30,7 @@ class PasswordConfig(Config): # Enable password for login. password_config: enabled: true - # Change to a secret random string. + # Uncomment and change to a secret random string for extra security. # DO NOT CHANGE THIS AFTER INITIAL SETUP! #pepper: "" """ |