summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
committerLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
commitb53085c02cf81855379eb460206ee5a45abc9163 (patch)
tree5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
parente2781960bad421c50ee348dbf9300b8ea71d83b1 (diff)
parentd2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff)
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml')
0 files changed, 0 insertions, 0 deletions