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-sp-2.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-sp-2.0.mxml')
| -rw-r--r-- | swamid-sp-2.0.mxml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 458d6597..55a27305 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -573,5 +573,8 @@ <xi:include href="swamid-2.0/ladok3test.its.umu.se-student-sp.xml"/> <xi:include href="swamid-2.0/student.mit-ik.ladok.se-student-sp.xml"/> <xi:include href="swamid-2.0/student.mit.ladok.se-student-sp.xml"/> + <xi:include href="swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml"/> + <xi:include href="swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml"/> + <xi:include href="swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml"/> <xi:include href="swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml"/> </md:EntitiesDescriptor> |