diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-05-29 07:51:38 +0200 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-05-29 07:51:38 +0200 |
| commit | b76474bb8f3a8864e70ec433ce32385210146f5a (patch) | |
| tree | 4ed157f8652eb368efea381263f243a1eaddbbd9 /swamid-sp-2.0.mxml | |
| parent | 086530fdc2ad2fa06a3482dc469e08990690882f (diff) | |
| parent | 4eea17469366143f277688b8edae06c8cf236741 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index acadbb4c..261e5f0c 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -59,5 +59,6 @@ <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml"/> <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml"/> <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-sp.xml"/> + <xi:include href="swamid-2.0/uninett-box-idp.nordu.net.xml"/> <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/> </md:EntitiesDescriptor> |