summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-5/+0
|\
| * http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Paul Scott2015-07-311-46/+49
| * http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-07-311-49/+46
* | http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-231-46/+49
* | http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-231-49/+46
|/
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-46/+49
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-49/+46
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-46/+49
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-49/+46
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-46/+49
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-49/+46
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-46/+49
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-0/+105
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 20:01:59 +0000