summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorWill Hunt <willh@matrix.org>2021-06-29 21:49:25 +0100
committerWill Hunt <willh@matrix.org>2021-06-29 21:49:25 +0100
commit81dd28c2165128b268f48f1c813683ae6cdc0c7c (patch)
treec4499c8e115bb1000f1ece3703a82ef7d554acd3 /docker
parentMerge tag 'v1.37.0rc1' into hs/hacked-together-event-cache (diff)
parentMerge branch 'release-v1.37' into develop (diff)
downloadsynapse-81dd28c2165128b268f48f1c813683ae6cdc0c7c.tar.xz
Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-cache
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions