diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-09-28 14:25:04 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-09-28 14:25:04 +0200 |
| commit | 8d970b8e2158e6de1b736720422e0bc5f45732a3 (patch) | |
| tree | 4cd5794ceefe7ad6e2af153499beaf665adb95ac /swamid-discovery.mxml | |
| parent | 850e077b5b084c134d40f6c7bfec09e37836ca96 (diff) | |
| parent | 0ba94c3f7dae2e4a2f4ad3ae94c7a07435d652b0 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-discovery.mxml')
0 files changed, 0 insertions, 0 deletions