aboutsummaryrefslogtreecommitdiff
path: root/repository/dav4j
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 14:52:57 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 14:52:57 +0100
commitff1af4decacd8467245a6f4bf0c6c5e6a4649e7f (patch)
tree6e2b55bb00667e152f96d3486c9015c8cc33991d /repository/dav4j
parente01b0fee1d650159561071bdb6027039edc2b76d (diff)
parentc514e19e4915c59f20dd25be1ede953b3d8b02ac (diff)
downloadmoa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.gz
moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.bz2
moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.zip
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts: id/server/idserverlib/pom.xml id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
Diffstat (limited to 'repository/dav4j')
0 files changed, 0 insertions, 0 deletions