diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 11:43:54 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 11:43:54 +0100 |
| commit | 3474af93a3436a334a1e7e903e6f6dcc5fdb774c (patch) | |
| tree | 964241ebbffcce696356c661a2f40c8045fb54f0 /id/server/idserverlib/src/main | |
| parent | b60b2ed4ddae5f7b67f4d08af281a8fef2661f7a (diff) | |
| parent | d69ba86f0855097e46e525794075f3c743e7facb (diff) | |
| download | moa-id-spss-3474af93a3436a334a1e7e903e6f6dcc5fdb774c.tar.gz moa-id-spss-3474af93a3436a334a1e7e903e6f6dcc5fdb774c.tar.bz2 moa-id-spss-3474af93a3436a334a1e7e903e6f6dcc5fdb774c.zip | |
Merge branch 'Branch_MOA-ID-3.2.1' into eIDAS_node_implementation
# Conflicts:
# id/server/moa-id-commons/pom.xml
# id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/IeIDASAttribute.java
# id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eIDASAttrDateOfBirth.java
# id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eIDASAttrLegalName.java
# id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eIDASAttrLegalPersonIdentifier.java
# pom.xml
Diffstat (limited to 'id/server/idserverlib/src/main')
0 files changed, 0 insertions, 0 deletions