summary refs log tree commit diff
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-10 12:58:33 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-10 12:58:33 +0000
commitaa70d2412570d6d810fe8c0a625a41584c99b7d2 (patch)
treef3c8f54409fe6ecd3a6cb25a9f1a8aeeaf84596f /docker/Dockerfile
parentClarify that py2 packages will continue to exist (diff)
parentFix macaroon_secret_key fallback logic (diff)
downloadsynapse-aa70d2412570d6d810fe8c0a625a41584c99b7d2.tar.xz
Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34
Diffstat (limited to 'docker/Dockerfile')
0 files changed, 0 insertions, 0 deletions