summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-1/+1
|\
| * http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Paul Scott2015-07-311-47/+50
| * http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-07-311-50/+47
* | http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-231-47/+50
* | http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-231-50/+47
|/
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-47/+50
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-50/+47
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-47/+50
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-50/+47
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-47/+50
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-50/+47
* http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...Leif Johansson2015-07-091-47/+50
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-0/+93