summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml
Commit message (Collapse)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-0/+90