Commit f40e1216 authored by Mark Harding's avatar Mark Harding
Browse files

Merge branch 'goal/pro-sso' into 'master' 

SSO for Pro sites

Closes #2264 and #2243

See merge request !656
parents a98598c3 9615d60e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment