diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-04-10 14:47:17 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-04-10 14:47:17 +0200 |
| commit | abed962bdcdc97178d4bc658bdaa8a5892aa4e63 (patch) | |
| tree | b5deebe3209148889ef496f1a31d69500e6855fb /swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml | |
| parent | cbc1bbbaed145de2dfd6b09387f55fa14786ccdc (diff) | |
| parent | 3ec6224cc6cf1ad320a51edd64b415be4641aa09 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml')
0 files changed, 0 insertions, 0 deletions