diff options
| author | Thomas <> | 2022-06-03 07:16:44 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-06-03 07:16:44 +0200 |
| commit | 86da2487154632cfe5b280ffd87933d08571029b (patch) | |
| tree | 5fd13d99feeb56ea512fb67c58692c63ec85e008 /.gitignore | |
| parent | 7100b253fe4712f6c820d11ed341366b3ec67623 (diff) | |
| parent | 2eb2e6ddeb189ffb2996f3ec3b16244a67bd13e9 (diff) | |
| download | National_eIDAS_Gateway-86da2487154632cfe5b280ffd87933d08571029b.tar.gz National_eIDAS_Gateway-86da2487154632cfe5b280ffd87933d08571029b.tar.bz2 National_eIDAS_Gateway-86da2487154632cfe5b280ffd87933d08571029b.zip | |
Merge branch 'feature/eidasnode_v2.6' into feature/ms_proxy_before_refactoring
# Conflicts:
# basicConfig/templates/error_message.html
# modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions