summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-07-26 12:39:33 +0100
committerRichard van der Hoff <richard@matrix.org>2019-07-26 12:39:33 +0100
commitd74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a (patch)
treea00671f417602e46b5e6d9c31bcd2f92b4095673 /docker
parentMerge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch (diff)
parentyet more changelog attribution fixes (diff)
downloadsynapse-d74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions