summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-3/+3
|\
| * http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-07-311-14/+12
| * https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Paul Scott2015-07-311-12/+14
* | http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-231-14/+12
* | https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Leif Johansson2015-07-231-12/+14
|/
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-14/+12
* https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Leif Johansson2015-07-091-12/+14
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-14/+12
* https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Leif Johansson2015-07-091-0/+83