summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-2/+13
* http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-07-311-0/+52