diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
| commit | b217869b73c7ceb7653972740e0f796cf9bbd383 (patch) | |
| tree | ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-interfederations-1.0/swamid.user.uu.se.xml | |
| parent | 5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff) | |
| parent | c5391135cbba3c20214e9e44c433925931df1453 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0/shib-idp-1.oru.se.xml
Diffstat (limited to 'swamid-interfederations-1.0/swamid.user.uu.se.xml')
0 files changed, 0 insertions, 0 deletions