diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2021-01-12 16:14:59 +0100 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2021-01-12 16:14:59 +0100 |
| commit | e1fe4825116ff87d3352aee248920a6e561b1ee0 (patch) | |
| tree | 13f45dc7c7e8048a20fdc2a20eb5d49f26fc0b2f /basicConfig/properties | |
| parent | c1b44dcd325e9e49ba38c384b9bfb981dca5a776 (diff) | |
| parent | 7961d920b67a4ce6cfb6bb9d9941242041bd47c6 (diff) | |
| download | National_eIDAS_Gateway-e1fe4825116ff87d3352aee248920a6e561b1ee0.tar.gz National_eIDAS_Gateway-e1fe4825116ff87d3352aee248920a6e561b1ee0.tar.bz2 National_eIDAS_Gateway-e1fe4825116ff87d3352aee248920a6e561b1ee0.zip | |
Merge branch 'eidas-matching' into issue6
# Conflicts:
# eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
Diffstat (limited to 'basicConfig/properties')
0 files changed, 0 insertions, 0 deletions