aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2014-03-04 23:27:21 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2014-03-04 23:27:21 +0100
commite1a7da578e195a59f4981bc56a9b8c615f1e69d2 (patch)
treef77153bf75580e1672a2442020708a872053cc59 /id/server/data/deploy/conf/moa-id-configuration/htmlTemplates
parent9753d2e1c9fde6778e070825b141e0e69323c9b6 (diff)
parentf5440a189b89bd4aa69d6d54445579484d5d7228 (diff)
downloadmoa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.gz
moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.bz2
moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.zip
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts: id/server/doc/handbook/config/config.html
Diffstat (limited to 'id/server/data/deploy/conf/moa-id-configuration/htmlTemplates')
0 files changed, 0 insertions, 0 deletions