summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-10 14:12:50 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-10 14:12:50 +0000
commite0910d01450fea79fc34f1882c293b026e2bd717 (patch)
tree33ea25377ca99c0eff44123d9539531d7ae8fd14 /docker
parentfix docker build to install optional deps (diff)
parentRevert "Fix macaroon_secret_key fallback logic" (diff)
downloadsynapse-e0910d01450fea79fc34f1882c293b026e2bd717.tar.xz
Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1
Fixes #4371
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions