diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml')
| -rw-r--r-- | swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml index 400e4b94..57746f28 100644 --- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml +++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml @@ -10,7 +10,7 @@ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="da">University College Syddanmark</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">University College Southern Denmark</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DomainHint>ucsyd.dk</mdui:DomainHint> @@ -67,11 +67,11 @@ khTTgjpn99S7L2hP </md:IDPSSODescriptor> <md:Organization> <md:OrganizationName xml:lang="da">University College Syddanmark</md:OrganizationName> - <md:OrganizationName xml:lang="en">University College Southern Denmark</md:OrganizationName> + <md:OrganizationName xml:lang="en">University College South Denmark</md:OrganizationName> <md:OrganizationDisplayName xml:lang="da">University College Syddanmark</md:OrganizationDisplayName> - <md:OrganizationDisplayName xml:lang="en">University College Southern Denmark</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="en">University College South Denmark</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="da">http://ucsyd.dk/</md:OrganizationURL> - <md:OrganizationURL xml:lang="en">http://ucsyd.dk/</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> <md:GivenName>WAYF</md:GivenName> |