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