summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
Commit message (Collapse)AuthorAgeFilesLines
* resolve conflicts and mergeLeif Johansson2015-08-111-0/+56