aboutsummaryrefslogtreecommitdiff
path: root/id/pom.xml
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-08-27 12:07:52 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-08-27 12:07:52 +0200
commit1051a42329a603821f415383343d253724d4cd65 (patch)
treef8a0b6e8445b7034dfe38d6ba3a61f1429a75a6e /id/pom.xml
parentbb1b12ac5b240629e16ea1c7a50891e99f4adc14 (diff)
parenteb0cf88708f3d689c2cb6bb0dbf83dd290bee887 (diff)
downloadmoa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.gz
moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.bz2
moa-id-spss-1051a42329a603821f415383343d253724d4cd65.zip
Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
Diffstat (limited to 'id/pom.xml')
0 files changed, 0 insertions, 0 deletions