diff options
author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:27:55 +0100 |
---|---|---|
committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:27:55 +0100 |
commit | d828b0b377a1bd61a04f0886c9d24aa1eb19c025 (patch) | |
tree | ac7f578e5cf6f4840eb5c6f662b3b6cf96a6a40e /repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar | |
parent | 0499a41a86a6b44092eb6ad356858cd36a3d19c0 (diff) | |
parent | 19e164874ea92d51f9df12f56047d77db9683091 (diff) | |
download | moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.tar.gz moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.tar.bz2 moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.zip |
Merge branch 'moa2_0_tlenz_bs_3' into moa2_0_tlenz_bs_3_ar
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
Diffstat (limited to 'repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar')
-rw-r--r-- | repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar | bin | 180095 -> 282629 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar Binary files differindex 5ad0cb42e..8414d7851 100644 --- a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar +++ b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar |