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/memso.tannerritchie.com-shibboleth-sp.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml')
| -rw-r--r-- | swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml index 94f9c40d..86deda1d 100644 --- a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml +++ b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml @@ -25,6 +25,11 @@ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> <Extensions> <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tannerritchie.com/Shibboleth.sso/DS" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="en">TannerRitchie Publishing</mdui:DisplayName> + <mdui:Description xml:lang="en">Medieval and Early Modern Sources Online (MEMSO) is an essential resource for the study of Britain and its place in the world during the medieval and early modern period (c. 1100-1800)</mdui:Description> + <mdui:Logo height="116" width="491">https://tannerritchie.com/img/logo-blackonwhite-master.png</mdui:Logo> + </mdui:UIInfo> </Extensions> <KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> |