diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-07-02 15:45:05 +0200 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-07-02 15:45:05 +0200 |
| commit | b5900214be5e15fc5b839b39dcf710b46088e697 (patch) | |
| tree | 35a47cbe70c8e82c108a9db96073f8bc894b69bb /swamid-testing-sp-1.0.mxml | |
| parent | f99687b4cc911dbc2e07cbf7e62fd43ccb060a95 (diff) | |
| parent | f7726cc3717fdc943196d70580a44351b192f7aa (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-testing-sp-1.0.mxml')
| -rw-r--r-- | swamid-testing-sp-1.0.mxml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml index 4170194d..cd1c1603 100644 --- a/swamid-testing-sp-1.0.mxml +++ b/swamid-testing-sp-1.0.mxml @@ -306,4 +306,5 @@ <xi:include href="swamid-1.0/portalservicesutv.miun.se-shibboleth.xml"/> <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/> <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/> + <xi:include href="swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/> </EntitiesDescriptor> |