diff options
| author | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-05-03 16:49:54 +0200 |
|---|---|---|
| committer | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-05-03 16:49:54 +0200 |
| commit | 63fe333dd2b356e4a131243586c247f2f222ff48 (patch) | |
| tree | a948062e05a9a8dbde06eb821410674b0020149c /swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml | |
| parent | da5be4e364b2463e0f7764b9d1e8d214d1cf5f51 (diff) | |
| parent | 53f08ded48c85f0e29bebe3ca12034b73e0c97b2 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml')
0 files changed, 0 insertions, 0 deletions