aboutsummaryrefslogtreecommitdiff
path: root/spss/server/serverws/data/deploy
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-04 20:23:15 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-04 20:23:15 +0100
commit6cddcc22ff639efb12bf3052588fde3a326e5fdc (patch)
tree58be11f2a24df2f660d543d70530817d798910a1 /spss/server/serverws/data/deploy
parent55885d24e176c92b97af233796189c8b2cc88808 (diff)
parenta0d2ea64de1589b7f808240390ecb39309ed2a44 (diff)
downloadmoa-id-spss-6cddcc22ff639efb12bf3052588fde3a326e5fdc.tar.gz
moa-id-spss-6cddcc22ff639efb12bf3052588fde3a326e5fdc.tar.bz2
moa-id-spss-6cddcc22ff639efb12bf3052588fde3a326e5fdc.zip
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/DataContainer.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
Diffstat (limited to 'spss/server/serverws/data/deploy')
0 files changed, 0 insertions, 0 deletions