diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-08 10:55:12 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-08 10:55:12 +0200 |
commit | 487db6041f9c215e7d6cb93ed1d5b93ebb607ee3 (patch) | |
tree | c9302a52902d025c48105a87c9f43d5c2793bf92 /id/server/doc/conf/moa-id/certs/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD | |
parent | 9d07e7a6dcd66c0ebff241e4f0113b787fcbcffb (diff) | |
parent | 49daddb4b7296311aa68fc717dfcb35005e16b3e (diff) | |
download | moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.gz moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.bz2 moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.zip |
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
Diffstat (limited to 'id/server/doc/conf/moa-id/certs/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD')
0 files changed, 0 insertions, 0 deletions