Commit 3eadb4d8 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Merge branch 'saml_social_provider' into '7-12-stable'

Merge branch 'SAML_1888' into 'master'

Add SAML to list of social_provider

See merge request !894
parents 9852183e d835b20d
Supports Markdown
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