aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy/conf/moa-id-configuration
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-13 12:06:41 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-13 12:06:41 +0100
commit4b3324b88ed5246bb27de86f19f6de49c98f0615 (patch)
treeb17cbecffdd33208537aaace8430b1bcff2083e0 /id/server/data/deploy/conf/moa-id-configuration
parentb6076468ae4c2fda384d051adece37a351faae31 (diff)
parent713ca50cbcb276254689088ea558401af018ffcd (diff)
downloadmoa-id-spss-4b3324b88ed5246bb27de86f19f6de49c98f0615.tar.gz
moa-id-spss-4b3324b88ed5246bb27de86f19f6de49c98f0615.tar.bz2
moa-id-spss-4b3324b88ed5246bb27de86f19f6de49c98f0615.zip
Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2
Diffstat (limited to 'id/server/data/deploy/conf/moa-id-configuration')
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties (renamed from id/server/data/deploy/conf/moa-id-configuration/moa-id.properties)0
1 files changed, 0 insertions, 0 deletions
diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index 2bb9cb005..2bb9cb005 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties