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-sp-2.0.mxml | |
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-sp-2.0.mxml')
-rw-r--r-- | swamid-sp-2.0.mxml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 09dd4aca..8607d22d 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -64,4 +64,13 @@ <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/> <xi:include href="swamid-2.0/hashog.umdc.umu.se-8087-HTH.xml"/> <xi:include href="swamid-2.0/problem.math.su.se-shilsbboleth.xml"/> + <xi:include href="swamid-1.0/expert.antagning.se.xml"/> + <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/> + <xi:include href="swamid-1.0/www.universityadmissions.se-aws-sp-en.xml"/> + <xi:include href="swamid-1.0/expert.testa.antagning.se-ecs-sp.xml"/> + <xi:include href="swamid-1.0/www.testa.antagning.se-aws-sp.xml"/> + <xi:include href="swamid-1.0/www.testa.universityadmissions.se.xml"/> + <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/> + <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/> + <xi:include href="swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml"/> </md:EntitiesDescriptor> |