diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
| commit | 35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3 (patch) | |
| tree | 2c844b79665fc32b0bfc49285586394edf367131 /synapse/config/key.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff) | |
| download | synapse-35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_invite_server
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 3b11f0cfa9..dce4b19a2d 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -83,9 +83,6 @@ class KeyConfig(Config): # a secret which is used to sign access tokens. If none is specified, # the registration_shared_secret is used, if one is given; otherwise, # a secret key is derived from the signing key. - # - # Note that changing this will invalidate any active access tokens, so - # all clients will have to log back in. %(macaroon_secret_key)s # Used to enable access token expiration. |