diff options
| author | Fredrik Aslund <fredrik.aslund@umu.se> | 2014-12-19 11:21:51 +0100 |
|---|---|---|
| committer | Fredrik Aslund <fredrik.aslund@umu.se> | 2014-12-19 11:21:51 +0100 |
| commit | 9b0b37f6bf69f082fdfa2ae33281304dc0e2a25a (patch) | |
| tree | d89e9f86b844d3ddeb34bc8dfd7a74ef6d237326 /swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml | |
| parent | dcb10f6cfe3b1909dd2b3e93ba7fc76078f2f087 (diff) | |
| parent | babe8024f18f22c7aba9adfd78e3484f4826be0c (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml')
0 files changed, 0 insertions, 0 deletions