summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-12-09 16:13:52 +0000
committerRichard van der Hoff <richard@matrix.org>2020-12-09 16:13:52 +0000
commita4a5c7a35e3231f0a7ad799e0d2fce8c3e69603b (patch)
tree11f86252771d5e0dda02674d2ebaaca5bca41b7b /docker
parentMerge branch 'release-v1.24.0' into develop (diff)
parentMerge pull request #8906 from matrix-org/rav/fix_multiarch_builds (diff)
downloadsynapse-a4a5c7a35e3231f0a7ad799e0d2fce8c3e69603b.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions