aboutsummaryrefslogtreecommitdiff
path: root/id/server/modules/module-monitoring
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 06:46:21 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 06:46:21 +0100
commit4dfca16cb46126d564240767a89fe8a9f4f9bcdf (patch)
tree9fee58a1ba475f359992233dffc14e3fc206a978 /id/server/modules/module-monitoring
parent86cbb2b42468b71cc9c04785d075260cf80fbb9f (diff)
parent3ca240a596e3d2d22a7a6c68ce9c34dda9168e2c (diff)
downloadmoa-id-spss-4dfca16cb46126d564240767a89fe8a9f4f9bcdf.tar.gz
moa-id-spss-4dfca16cb46126d564240767a89fe8a9f4f9bcdf.tar.bz2
moa-id-spss-4dfca16cb46126d564240767a89fe8a9f4f9bcdf.zip
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts: 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
Diffstat (limited to 'id/server/modules/module-monitoring')
0 files changed, 0 insertions, 0 deletions