diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:10:28 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:10:28 +0200 |
commit | bb06ad890498e2428c3f4268ae2f732a0f75bd77 (patch) | |
tree | d5a422144d55c96a0e87965ecc6ce036080d7133 /id/server/doc/conf/moa-id-configuration/keys/assertion.crt | |
parent | c44e10f563cae97ce3c4a64f7ba3e8777e131a0d (diff) | |
parent | a6d06a04fdd2caaebb387be3d85107658c08f345 (diff) | |
download | moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.tar.gz moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.tar.bz2 moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.zip |
merge VIDP updates to Snapshot branch
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/server/doc/conf/moa-id-configuration/keys/assertion.crt')
0 files changed, 0 insertions, 0 deletions