Skip to content
Commit 0a7d508f authored by masensio's avatar masensio
Browse files

Merge branch 'master' into saml_based_federated_single_sign_on

parents ea5cd966 112cc0f8
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