Skip to content
Commit 3806916a authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into regular_authentication_in_saml_server

parents 92c90490 ee28694a
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