summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-22 13:36:36 +0000
committerErik Johnston <erik@matrix.org>2021-03-22 13:36:36 +0000
commitd600d4506b1381e3db1e8f36abafd4038cedf905 (patch)
tree2d120cde0d29788f672daf13dca9eb1f6a80f36c /docker
parentMerge pull request #9644 from matrix-org/babolivier/msc3026 (diff)
parent 1.30.0 (diff)
downloadsynapse-d600d4506b1381e3db1e8f36abafd4038cedf905.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions