diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-05-11 00:19:26 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-05-11 00:19:26 +0100 |
commit | bd8d0cfab1d6889e3a5656400cf4212da35224aa (patch) | |
tree | d7c6f45ee742673f80fd88af9e7eb5a4e6b46ec1 /synapse/config/key.py | |
parent | Merge pull request #3203 from matrix-org/rav/refactor_request_handler (diff) | |
parent | missing word :| (diff) | |
download | synapse-bd8d0cfab1d6889e3a5656400cf4212da35224aa.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions