Merge branch 'jbau/new-shib' of https://github.com/edx/configuration into jbau/new-shib
Conflicts: playbooks/roles/shibboleth/vars/main.yml
Showing
Please
register
or
sign in
to comment
Conflicts: playbooks/roles/shibboleth/vars/main.yml