diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-03-30 09:41:49 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-03-30 09:41:49 +0200 |
| commit | fc7b509ade0178cc322d21c045d7597fc9422685 (patch) | |
| tree | 2d124d46933a4a458fb0bebe89aa2dc7fd425da3 /id/assembly-auth-final.xml | |
| parent | c33f026d4e41a0d5faa27cd8cc924988343b95fd (diff) | |
| parent | 98bc3e020f01a00d8a686c9c6005a71133cbd2a4 (diff) | |
| download | moa-id-spss-fc7b509ade0178cc322d21c045d7597fc9422685.tar.gz moa-id-spss-fc7b509ade0178cc322d21c045d7597fc9422685.tar.bz2 moa-id-spss-fc7b509ade0178cc322d21c045d7597fc9422685.zip | |
Merge eIDAS code from eIDAS development branch
Infos:
Merge remote-tracking branch 'remotes/origin/eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts:
id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
id/server/pom.xml
repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.jar
repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom
repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.jar
repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom
Diffstat (limited to 'id/assembly-auth-final.xml')
0 files changed, 0 insertions, 0 deletions