diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-21 13:27:04 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-21 13:27:04 +0100 |
commit | 67b73fd14741a63b60bfa356ad165705459889fd (patch) | |
tree | 3b1dfa664088284709facfb6867013a11c8a3745 /synapse/config/jwt_config.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #5505 from matrix-org/erikj/messages_worker (diff) | |
download | synapse-67b73fd14741a63b60bfa356ad165705459889fd.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/jwt_config.py')
-rw-r--r-- | synapse/config/jwt_config.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py |