summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-09 15:00:46 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-09 15:00:46 +0000
commitd566e6b17ab1a1bcd390188368d111fb4899b918 (patch)
tree7088a92417b10e3288c4d3b8359141cd39bf0924 /docker
parentMerge pull request #4368 from matrix-org/erikj/better_errors (diff)
parent0.34.1 (diff)
downloadsynapse-d566e6b17ab1a1bcd390188368d111fb4899b918.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions