Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorLeif Johansson <leifj@sunet.se>
Mon, 28 Sep 2015 12:25:04 +0000 (14:25 +0200)
committerLeif Johansson <leifj@sunet.se>
Mon, 28 Sep 2015 12:25:04 +0000 (14:25 +0200)
Conflicts:
swamid-sp-2.0.mxml

1  2 
swamid-sp-2.0.mxml

    <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
    <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>