summary refs log tree commit diff
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-24 17:03:50 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-24 17:03:50 +0100
commit9b7c4f40782b09000141d7311fc39d387336350a (patch)
tree0c64c6ace7581c2f4e83c6b79159a11d35fc20e1 /docker/Dockerfile
parentMerge remote-tracking branch 'origin/develop' into rav/saml_mapping_work (diff)
parentremove unused parameter to get_user_id_by_threepid (#6099) (diff)
downloadsynapse-9b7c4f40782b09000141d7311fc39d387336350a.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work
Diffstat (limited to 'docker/Dockerfile')
0 files changed, 0 insertions, 0 deletions