diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-09-28 14:25:04 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-09-28 14:25:04 +0200 |
| commit | 8d970b8e2158e6de1b736720422e0bc5f45732a3 (patch) | |
| tree | 4cd5794ceefe7ad6e2af153499beaf665adb95ac /swamid-sp-2.0.mxml | |
| parent | 850e077b5b084c134d40f6c7bfec09e37836ca96 (diff) | |
| parent | 0ba94c3f7dae2e4a2f4ad3ae94c7a07435d652b0 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 7703e66c..28ae4b1d 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -460,4 +460,6 @@ <xi:include href="swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml"/> <xi:include href="swamid-2.0/play.hkr.se.xml"/> <xi:include href="swamid-2.0/saml.salesforce.com-sunet-sandbox.xml"/> + <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/> + <xi:include href="swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml"/> </md:EntitiesDescriptor> |