summaryrefslogtreecommitdiff
path: root/eaaf_modules/eaaf_module_pvp2_sp/src
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-02-17 08:10:16 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-02-17 08:10:16 +0100
commitb8b5d79f36c0d51a10dc820b09833179442b5155 (patch)
tree7f4ff3c66c8b57b919cd83a4fc8a0247e9c7c0ab /eaaf_modules/eaaf_module_pvp2_sp/src
parent8fd4b91b8da067055133b2feb97e726c6a834c78 (diff)
parentc4e1a45e7958cab402d83f6f4ae208df1bb2ab58 (diff)
downloadEAAF-Components-b8b5d79f36c0d51a10dc820b09833179442b5155.tar.gz
EAAF-Components-b8b5d79f36c0d51a10dc820b09833179442b5155.tar.bz2
EAAF-Components-b8b5d79f36c0d51a10dc820b09833179442b5155.zip
Merge branch 'feature/hsmfacade' into nightlyBuild
# Conflicts: # eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java # eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml
Diffstat (limited to 'eaaf_modules/eaaf_module_pvp2_sp/src')
0 files changed, 0 insertions, 0 deletions