summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-18 09:42:45 +0000
committerGitHub <noreply@github.com>2019-02-18 09:42:45 +0000
commit4151111d953696856bbe1d9256c629ad6f340470 (patch)
treeb494b9cbe8b164a9292d4894183b38924d91e258 /synapse
parentMerge pull request #4647 from matrix-org/erikj/add_room_publishing_rules (diff)
parentUPGRADE.rst: Fix a typo in "Upgrading Synapse" section (diff)
downloadsynapse-4151111d953696856bbe1d9256c629ad6f340470.tar.xz
Merge pull request #4657 from matrix-org/travis/linda/spelling
Fix spelling mistakes
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/key.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py
index dce4b19a2d..499ffd4e06 100644
--- a/synapse/config/key.py
+++ b/synapse/config/key.py
@@ -56,7 +56,7 @@ class KeyConfig(Config):
         if not self.macaroon_secret_key:
             # Unfortunately, there are people out there that don't have this
             # set. Lets just be "nice" and derive one from their secret key.
-            logger.warn("Config is missing missing macaroon_secret_key")
+            logger.warn("Config is missing macaroon_secret_key")
             seed = bytes(self.signing_key[0])
             self.macaroon_secret_key = hashlib.sha256(seed).digest()