diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-12-11 11:34:54 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-12-11 11:34:54 +0100 |
| commit | 258bdb751beb4c2f82306e67f067d1bb9df2743a (patch) | |
| tree | 6361089b8813665708a889bd1304ab63f248e6a9 /id/ConfigWebTool | |
| parent | caa1690996b62c0ffa7fa99162e583fcf98bd26c (diff) | |
| parent | f18f6318f7233b336ea2653f183460f17d6562f0 (diff) | |
| download | moa-id-spss-258bdb751beb4c2f82306e67f067d1bb9df2743a.tar.gz moa-id-spss-258bdb751beb4c2f82306e67f067d1bb9df2743a.tar.bz2 moa-id-spss-258bdb751beb4c2f82306e67f067d1bb9df2743a.zip | |
Merge branch 'development_preview' into eIDAS_node_implementation
# Conflicts:
# id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/MOAMetadataProvider.java
# id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/PVPEntityCategoryFilter.java
Diffstat (limited to 'id/ConfigWebTool')
0 files changed, 0 insertions, 0 deletions