diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-04-10 14:47:17 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-04-10 14:47:17 +0200 |
| commit | abed962bdcdc97178d4bc658bdaa8a5892aa4e63 (patch) | |
| tree | b5deebe3209148889ef496f1a31d69500e6855fb /swamid-sp-2.0.mxml | |
| parent | cbc1bbbaed145de2dfd6b09387f55fa14786ccdc (diff) | |
| parent | 3ec6224cc6cf1ad320a51edd64b415be4641aa09 (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 63954609..f27993c0 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -42,4 +42,5 @@ <xi:include href="swamid-2.0/ci.nordu.net.xml"/> <xi:include href="swamid-2.0/www.akademiskahogtider.se.xml"/> <xi:include href="swamid-2.0/testshib.msacademicverify.com.xml"/> + <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/> </md:EntitiesDescriptor> |