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/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml index 4ba71975..7cfca1d5 100644 --- a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml @@ -9,10 +9,10 @@ <md:Extensions> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName> - <mdui:DisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName> - <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description> - <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description> + <mdui:DisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName> + <mdui:DisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName> + <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per il Colosseo</mdui:Description> + <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per il Colosseo</mdui:Description> <mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL> <mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL> <mdui:Logo height="16" width="16" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo> @@ -96,10 +96,10 @@ D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> </md:AttributeAuthorityDescriptor> <md:Organization> - <md:OrganizationName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationName> - <md:OrganizationName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationDisplayName> - <md:OrganizationDisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationDisplayName> + <md:OrganizationName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName> + <md:OrganizationName xml:lang="it">SSCOL - Soprintendenza Speciale per il colosseo</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</md:OrganizationURL> <md:OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</md:OrganizationURL> </md:Organization> |