summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-06 13:05:22 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-06 13:05:22 +0100
commit4f8baab0c47432401036e639e12d65257bd6bb3d (patch)
tree1570528894d933a533b2a3fda13b65fc32ac218f /docker
parentMerge pull request #3790 from matrix-org/rav/respect_event_format_in_filter (diff)
parentMerge tag 'v0.33.3.1' (diff)
downloadsynapse-4f8baab0c47432401036e639e12d65257bd6bb3d.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions