summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-7/+5
|\
| * http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-07-311-6/+6
* | http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-231-6/+6
|/
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-07-091-0/+71