diff options
| author | tzefferer <tzefferer@gmail.com> | 2018-07-27 13:14:35 +0200 |
|---|---|---|
| committer | tzefferer <tzefferer@gmail.com> | 2018-07-27 13:14:35 +0200 |
| commit | 84f5ffce2e66e52a07ef6bdcb802e268566168e0 (patch) | |
| tree | 2c996d4d61511886804c83a9133b9d75ed635e48 /.gitignore | |
| parent | a3e019e87d78e17f24c170f7ef6a08d40ebfb232 (diff) | |
| parent | 6d09f43225ba2e0f6d7b0583f843c858a1015807 (diff) | |
| download | National_eIDAS_Gateway-84f5ffce2e66e52a07ef6bdcb802e268566168e0.tar.gz National_eIDAS_Gateway-84f5ffce2e66e52a07ef6bdcb802e268566168e0.tar.bz2 National_eIDAS_Gateway-84f5ffce2e66e52a07ef6bdcb802e268566168e0.zip | |
Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/eidas_at_proxy
# Conflicts:
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions