diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-08-16 16:41:40 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-08-16 16:41:40 +0200 |
| commit | 882505075b04f20f35f21cbd2e279d73c9eb24db (patch) | |
| tree | cf255166dd6788506a49e01633871f3fb7165eff /eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml | |
| parent | b77f20a6e3167339053450c64a8485f8d7f410a8 (diff) | |
| parent | 135088e2ee76f7edae9bf39607d24ca23eb90e35 (diff) | |
| download | National_eIDAS_Gateway-882505075b04f20f35f21cbd2e279d73c9eb24db.tar.gz National_eIDAS_Gateway-882505075b04f20f35f21cbd2e279d73c9eb24db.tar.bz2 National_eIDAS_Gateway-882505075b04f20f35f21cbd2e279d73c9eb24db.zip | |
Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/eidas_at_proxy
# Conflicts:
# eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
Diffstat (limited to 'eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml')
0 files changed, 0 insertions, 0 deletions