diff options
| author | Thomas <> | 2022-01-08 19:50:42 +0100 |
|---|---|---|
| committer | Thomas <> | 2022-01-08 19:50:42 +0100 |
| commit | 5bdcf4b0298da05efb06eb84acdb188e4313df75 (patch) | |
| tree | a1c40aef7914f58950d3ecc06e0811131430ddd3 /.gitignore | |
| parent | d7f9aa156ad76e5ddaf797a16f1155c37594bd91 (diff) | |
| parent | f59462296cf6eb0401be025a64b1be9ec8afc541 (diff) | |
| download | EAAF-Components-5bdcf4b0298da05efb06eb84acdb188e4313df75.tar.gz EAAF-Components-5bdcf4b0298da05efb06eb84acdb188e4313df75.tar.bz2 EAAF-Components-5bdcf4b0298da05efb06eb84acdb188e4313df75.zip | |
Merge branch 'opensaml_4.x' into nightlyBuild
# Conflicts:
# eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
# eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/SamlVerificationEngine.java
# eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
# eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyMetadataProvider.java
# eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
# eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
# pom.xml
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions