diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-02-22 13:02:47 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-02-22 13:02:47 +0100 |
| commit | 4215d7ef6970f34f5f0e1f65ecd8253dd6827203 (patch) | |
| tree | 2c327727a20a6b19cfd848b7fe4739f6f4d6757e /id/ConfigWebTool/src/main/resources/applicationResources_en.properties | |
| parent | ef59662475c60c027c698caacd2423b34b3524d3 (diff) | |
| parent | c9f7fb8a31dfe3669fd23b578ad67d24f71d2483 (diff) | |
| download | moa-id-spss-4215d7ef6970f34f5f0e1f65ecd8253dd6827203.tar.gz moa-id-spss-4215d7ef6970f34f5f0e1f65ecd8253dd6827203.tar.bz2 moa-id-spss-4215d7ef6970f34f5f0e1f65ecd8253dd6827203.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/modules/moa-id-module-ssoTransfer/pom.xml
id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/servlet/SSOTransferGUIServlet.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/SSOContainerUtils.java
Diffstat (limited to 'id/ConfigWebTool/src/main/resources/applicationResources_en.properties')
0 files changed, 0 insertions, 0 deletions