summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-19 18:20:23 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-19 18:20:23 +0100
commit6db5adca0c0de03c6496797fcb673698c058f525 (patch)
treeb7b2f9edb03089c522728fe829d9da8c0138ff48 /scripts
parentMerge branch 'develop' into rav/saml_mapping_work (diff)
parentMerge branch 'develop' into rav/saml_config_cleanup (diff)
downloadsynapse-6db5adca0c0de03c6496797fcb673698c058f525.tar.xz
Merge branch 'rav/saml_config_cleanup' into rav/saml_mapping_work
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions