summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-1/+1
|\
| * 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-06-221-6/+6
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-06-091-5/+5
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-06-051-5/+5
* http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-05-191-6/+6
* http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-05-081-6/+6
* http://mds.edugain.org into swamid-interfederations-2.0Paul Scott2015-04-241-41/+30
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-03-101-0/+89
* https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Leif Johansson2015-03-101-89/+0
* http://mds.edugain.org into swamid-interfederations-2.0Leif Johansson2015-01-201-62/+79
* http://mds.edugain.org into swamid-interfederations-2.0Anders Lördal2014-10-291-0/+72
* https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Anders Lördal2014-10-291-72/+0
* http://mds.edugain.org into swamid-interfederations-2.0Anders Lördal2014-10-291-0/+72