summaryrefslogtreecommitdiff
path: root/nya-1.0.mxml
diff options
context:
space:
mode:
authorroot <root@appliance.mnt.se>2010-09-17 16:36:38 +0200
committerroot <root@appliance.mnt.se>2010-09-17 16:36:38 +0200
commit90e47a4f2cfc3ea92ac441eff6d1fffbc2103cc2 (patch)
tree7234409406482a668d04cb2289d31b9be5b30baf /nya-1.0.mxml
parent505eb67dcc805867895432e5a587228952768e9b (diff)
parenta0290cf0c5be737cb9224c4e6a4a9ea3bd03b50d (diff)
Merge remote branch 'remotes/git-svn'
Diffstat (limited to 'nya-1.0.mxml')
-rw-r--r--nya-1.0.mxml1
1 files changed, 1 insertions, 0 deletions
diff --git a/nya-1.0.mxml b/nya-1.0.mxml
index a050042a..b96a37fa 100644
--- a/nya-1.0.mxml
+++ b/nya-1.0.mxml
@@ -21,4 +21,5 @@
<xi:include href="swamid-1.0/nyainloggning.slu.se.xml"/>
<xi:include href="swamid-1.0/webapp-utv.ita.mdh.se.xml"/>
<xi:include href="swamid-1.0/portal.mdh.se.xml"/>
+ <xi:include href="nya-1.0/shibboleth.antagning.se.xml"/>
</EntitiesDescriptor>