summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-51/+0
* http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-05-191-0/+51