summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml
Commit message (Collapse)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-0/+106