summary refs log tree commit diff
path: root/synapse/config/key.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-14 17:34:09 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-14 17:34:09 +0000
commitbf4fd1480652f2af1eb54326c5a3130ceb295a07 (patch)
tree7c015345c6d48b1ddd284a7c54c3ca7ec1219015 /synapse/config/key.py
parentMerge branch 'master' into develop (diff)
parentMerge branch 'release-v0.99.1' (diff)
downloadsynapse-bf4fd1480652f2af1eb54326c5a3130ceb295a07.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions