aboutsummaryrefslogtreecommitdiff
path: root/id/oa/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:31:39 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:31:39 +0200
commit408246a7cd0f8931f224d9d4d8e4469ab7bc6a21 (patch)
tree9726e6807e9cc0ca4b7603068f314a31a14349d1 /id/oa/src/main
parentbb06ad890498e2428c3f4268ae2f732a0f75bd77 (diff)
parent719b06ae04a8d96bf24268a4e25a0cd7b0768e95 (diff)
downloadmoa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.gz
moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.bz2
moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.zip
merge SSO interfederation into Snapshot branch
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/protocols/stork2/AuthenticationRequest.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/oa/src/main')
0 files changed, 0 insertions, 0 deletions