summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-24 17:05:15 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-24 17:05:15 +0100
commita7af389da081214eefb5c570d4093827c8fcfc67 (patch)
treef338c088c5046670cf7c19d2d94c0f8f6a8468f3 /synapse/api/auth.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #6037 from matrix-org/rav/saml_mapping_work (diff)
downloadsynapse-a7af389da081214eefb5c570d4093827c8fcfc67.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/auth.py')
0 files changed, 0 insertions, 0 deletions