aboutsummaryrefslogtreecommitdiff
path: root/spss/handbook/conf
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-09-05 09:46:38 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-09-05 09:46:38 +0200
commite3667b6ccf1ae70a8c93b0af7a5bcf505831b073 (patch)
tree85f74fd2bcf1745dfc8537db7c5c7d2468b46a75 /spss/handbook/conf
parentcf5cf7c5baa823329d38e764ea53efe8f291d367 (diff)
parenteb33e9afb53314c8ab1e0854c587a808e8605fad (diff)
downloadmoa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.tar.gz
moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.tar.bz2
moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.zip
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts: id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
Diffstat (limited to 'spss/handbook/conf')
0 files changed, 0 insertions, 0 deletions