summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml
Commit message (Collapse)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-0/+91