diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-02-24 16:34:29 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-02-24 16:34:29 +0100 |
| commit | 897fb60b521e647e15fbca4501066b11032558b6 (patch) | |
| tree | ed03574c5fd5dca7208b6d1bac253e56baed583a /id/server/auth/src/main/webapp/info_bk.html | |
| parent | 8f3e8cb7c0e3bd34d64e1d7310c2eecb9cfefa9a (diff) | |
| parent | 27208e456df5723a62d83ab7dbe66f2ab0bf6b8e (diff) | |
| download | moa-id-spss-897fb60b521e647e15fbca4501066b11032558b6.tar.gz moa-id-spss-897fb60b521e647e15fbca4501066b11032558b6.tar.bz2 moa-id-spss-897fb60b521e647e15fbca4501066b11032558b6.zip | |
Merge branch 'EGIZ_project-SSO_session_transfer' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into EGIZ_project-SSO_session_transfer
Conflicts:
id/server/auth/pom.xml
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/data/SSOTransferAuthenticationData.java
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/data/SSOTransferOnlineApplication.java
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/InitializeRestoreSSOSessionTask.java
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/utils/GUIUtils.java
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/utils/SSOContainerUtils.java
id/server/modules/moa-id-module-ssoTransfer/src/main/resources/at/gv/egovernment/moa/id/auth/modules/ssotransfer/SSOTransfer.authmodule.beans.xml
id/server/modules/moa-id-module-ssoTransfer/src/main/resources/at/gv/egovernment/moa/id/auth/modules/ssotransfer/SSOTransferAuthentication.process.xml
id/server/modules/pom.xml
Diffstat (limited to 'id/server/auth/src/main/webapp/info_bk.html')
0 files changed, 0 insertions, 0 deletions