summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
Commit message (Collapse)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-7/+2
|\
| * http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵Paul Scott2015-07-311-45/+48
| | | | | | | | swamid-interfederations-2.0
| * http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-07-311-0/+109
|
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵Leif Johansson2015-07-231-45/+48
| | | | swamid-interfederations-2.0
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-231-0/+109