diff options
author | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-05-03 16:49:54 +0200 |
---|---|---|
committer | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-05-03 16:49:54 +0200 |
commit | 63fe333dd2b356e4a131243586c247f2f222ff48 (patch) | |
tree | a948062e05a9a8dbde06eb821410674b0020149c /swamid-edugain-idp-1.0.mxml | |
parent | da5be4e364b2463e0f7764b9d1e8d214d1cf5f51 (diff) | |
parent | 53f08ded48c85f0e29bebe3ca12034b73e0c97b2 (diff) |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-edugain-idp-1.0.mxml')
-rw-r--r-- | swamid-edugain-idp-1.0.mxml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index ae3d78a2..dd45fb19 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -20,7 +20,6 @@ <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/> @@ -35,7 +34,6 @@ <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/> @@ -47,10 +45,11 @@ <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml.xml"/> <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idpv3.lu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml"/> + <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> |