diff options
| author | Thomas <> | 2022-01-10 17:51:02 +0100 |
|---|---|---|
| committer | Thomas <> | 2022-01-10 17:51:02 +0100 |
| commit | 0d9f042b4c88ba5f34da452cd19ada24146d32af (patch) | |
| tree | 1370658eae285efdcf1c76c075397540ca8de198 /connector/src/main/resources/META-INF | |
| parent | 29868d8000773c74c395891bebb685a3252e13ec (diff) | |
| parent | 0f0b59abce4242bdd69de1b48f2d197bc84255ba (diff) | |
| download | National_eIDAS_Gateway-0d9f042b4c88ba5f34da452cd19ada24146d32af.tar.gz National_eIDAS_Gateway-0d9f042b4c88ba5f34da452cd19ada24146d32af.tar.bz2 National_eIDAS_Gateway-0d9f042b4c88ba5f34da452cd19ada24146d32af.zip | |
Merge branch 'master' into feature/matching_base_rebase
# Conflicts:
# connector/pom.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java
# eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
# eidas_modules/authmodule-eIDAS-v2/pom.xml
# pom.xml
Diffstat (limited to 'connector/src/main/resources/META-INF')
0 files changed, 0 insertions, 0 deletions