summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-97/+0
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-0/+97