diff options
| author | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-03-14 13:12:32 +0100 |
|---|---|---|
| committer | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-03-14 13:12:32 +0100 |
| commit | 05d873447fcaf0fe379c589f913bdd372d2833fa (patch) | |
| tree | 9be8d349642186e550821c07ba043e1eddd9e6f0 /swamid-2.0/ladok3-p00.ladok.umu.se-student-frontend-sp.xml | |
| parent | e0cbeaefbc40681a905f81827fb98343997562a3 (diff) | |
| parent | c5c076bdd7797d9128355a1c54021d5f334e422c (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-testing-idp-1.0.mxml
Diffstat (limited to 'swamid-2.0/ladok3-p00.ladok.umu.se-student-frontend-sp.xml')
0 files changed, 0 insertions, 0 deletions