summaryrefslogtreecommitdiff
path: root/swamid-interfederations-1.0/idp.aalto.fi.xml
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-70/+0
* https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s...Leif Johansson2014-02-181-0/+70