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-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml')
0 files changed, 0 insertions, 0 deletions