summaryrefslogtreecommitdiff
path: root/swamid-externals-2.0.mxml
diff options
context:
space:
mode:
authorFredrik Aslund <fredrik.aslund@umu.se>2016-03-14 13:12:32 +0100
committerFredrik Aslund <fredrik.aslund@umu.se>2016-03-14 13:12:32 +0100
commit05d873447fcaf0fe379c589f913bdd372d2833fa (patch)
tree9be8d349642186e550821c07ba043e1eddd9e6f0 /swamid-externals-2.0.mxml
parente0cbeaefbc40681a905f81827fb98343997562a3 (diff)
parentc5c076bdd7797d9128355a1c54021d5f334e422c (diff)
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts: swamid-testing-idp-1.0.mxml
Diffstat (limited to 'swamid-externals-2.0.mxml')
0 files changed, 0 insertions, 0 deletions