aboutsummaryrefslogtreecommitdiff
path: root/SIC_LICENSE.txt
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-03-16 13:13:10 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-03-16 13:13:10 +0100
commit3a80aa7e900c77da7625886f72ee22666ecfae23 (patch)
tree5eef5ac02252c1f493908e34c773751987b257b1 /SIC_LICENSE.txt
parent226db2c5c41c149256459bf18dff4585a07e5ea1 (diff)
parentd69ba86f0855097e46e525794075f3c743e7facb (diff)
downloadmoa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.gz
moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.bz2
moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.zip
Merge branch 'Branch_MOA-ID-3.2.1' into development_preview
# Conflicts: # id/server/moa-id-commons/pom.xml # pom.xml
Diffstat (limited to 'SIC_LICENSE.txt')
0 files changed, 0 insertions, 0 deletions