diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-12-19 07:48:56 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-12-19 07:48:56 +0100 |
commit | 6e01fbb21b23d187cdb169ef0be8dfc15fc6638f (patch) | |
tree | d4ba735a5bd2f3f8e3e7f66372ccd5eef46e51fb /repository/iaik/prod | |
parent | ddd803e73a4519132ce2257c621b54d004f2235f (diff) | |
parent | 351f8be591412e124b6d578c1afd3f72f3c25d8f (diff) | |
download | moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.tar.gz moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.tar.bz2 moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.zip |
merge last changes to exthex.OAuth testrelease
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/StartAuthenticationBuilder.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
Diffstat (limited to 'repository/iaik/prod')
-rw-r--r-- | repository/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar | bin | 3663 -> 3630 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar b/repository/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar Binary files differindex 49ad2bf83..2750c5f52 100644 --- a/repository/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar +++ b/repository/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar |