aboutsummaryrefslogtreecommitdiff
path: root/id/server/proxy/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-03-08 11:12:56 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-03-08 11:12:56 +0100
commit6e57e33b0d06dd59124cd61dc2f78e3545642074 (patch)
tree74a58a789a2faba454d4f7b14237cd05c2e9e356 /id/server/proxy/src/main
parentb9937af42fdab6b85aa1121148bda474c70f5e75 (diff)
parentb40bfa06fb709386d21553a73700134cf013301d (diff)
downloadmoa-id-spss-6e57e33b0d06dd59124cd61dc2f78e3545642074.tar.gz
moa-id-spss-6e57e33b0d06dd59124cd61dc2f78e3545642074.tar.bz2
moa-id-spss-6e57e33b0d06dd59124cd61dc2f78e3545642074.zip
Merge branch 'EGIZ_project-SSO_session_transfer' into moa-id-3.2_(OPB)
Conflicts: id/server/modules/moa-id-module-ssoTransfer/src/test/java/at/gv/egiz/tests/Tests.java
Diffstat (limited to 'id/server/proxy/src/main')
0 files changed, 0 insertions, 0 deletions