aboutsummaryrefslogtreecommitdiff
path: root/LICENSE-2.0.txt
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:36:01 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:36:01 +0100
commitb757096ff32fa80908527220f8e08046015c2449 (patch)
tree837e839c74366a2b3af0c0dacf26cba1dc6f828d /LICENSE-2.0.txt
parented54650118390e2747dece3bad6bd74b6eefec7a (diff)
parent31a10590f3efee8aca463b43623ee689f7b0c605 (diff)
downloadmoa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.gz
moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.bz2
moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.zip
Merge branch 'bs_3_fr' into moa2_0_tlenz_bs_3
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
Diffstat (limited to 'LICENSE-2.0.txt')
0 files changed, 0 insertions, 0 deletions