Commit 7b668aea by Jason Bau

Merge branch 'jbau/new-shib' of https://github.com/edx/configuration into jbau/new-shib

Conflicts:
	playbooks/roles/shibboleth/vars/main.yml
parents 37f4f13f 5ed673d3
Markdown is supported
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