Skip to content
Commit 913a74d9 authored by masensio's avatar masensio
Browse files

Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on

parents 540d4e87 20afb728
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment