diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-09-11 08:03:54 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-09-11 08:03:54 +0200 |
| commit | b424e20e6497d6eadb559054d884f9f65d69411d (patch) | |
| tree | 8f9922cd7373b5f9f685a4367a5a42b8e58959fa /.gitignore | |
| parent | ab4bba8177a5b4382d9ebe8996b76c5c5200e4a3 (diff) | |
| parent | 5210dd7fef20776084f1106836f0e367654d6549 (diff) | |
| download | National_eIDAS_Gateway-b424e20e6497d6eadb559054d884f9f65d69411d.tar.gz National_eIDAS_Gateway-b424e20e6497d6eadb559054d884f9f65d69411d.tar.bz2 National_eIDAS_Gateway-b424e20e6497d6eadb559054d884f9f65d69411d.zip | |
Merge branch 'master' into nightlybuild
# Conflicts:
# basicConfig/default_config.properties
# connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java
# pom.xml
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions