diff options
author | Thomas <> | 2022-01-10 18:07:40 +0100 |
---|---|---|
committer | Thomas <> | 2022-01-10 18:07:40 +0100 |
commit | 6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715 (patch) | |
tree | 723fb115e6f328ad1836247f7e8e276e5269f5ff /connector/src/main/resources/properties | |
parent | 0d9f042b4c88ba5f34da452cd19ada24146d32af (diff) | |
parent | c007dfb5d809b532c17e1dcc1373dd8b2861f993 (diff) | |
download | National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.tar.gz National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.tar.bz2 National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.zip |
Merge branch 'nightlybuild' into feature/matching_base_rebase
# Conflicts:
# .gitlab-ci.yml
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
# pom.xml
Diffstat (limited to 'connector/src/main/resources/properties')
0 files changed, 0 insertions, 0 deletions