summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-07-28 10:36:55 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-07-28 10:36:55 +0100
commit1d3a9fe6e5cec793e7e259cf7e469fd4c8d79041 (patch)
tree7362257c5ff8e37b52334d06ab55d85fabc2dce8 /synapse/app/synchrotron.py
parentMerge remote-tracking branch 'origin/release-v1.38' into matrix-org-hotfixes (diff)
parentFix import of the default SAML mapping provider. (#10477) (diff)
downloadsynapse-1d3a9fe6e5cec793e7e259cf7e469fd4c8d79041.tar.xz
Merge branch 'release-v1.39' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/synchrotron.py')
0 files changed, 0 insertions, 0 deletions