aboutsummaryrefslogtreecommitdiff
path: root/build.bat
diff options
context:
space:
mode:
authorThomas Knall <t.knall@datentechnik-innovation.com>2015-01-30 13:15:05 +0100
committerThomas Knall <t.knall@datentechnik-innovation.com>2015-01-30 13:36:17 +0100
commita4b6ed0c8098600a19b122ae819e342b324ba66e (patch)
treeec8d51e257db7d47e4b5d631fe8df114245088b6 /build.bat
parent373641cfb0e404e89f4d9a011ae53d8b8cfc06c5 (diff)
parentfca585327afd4fd3dc0b5f1146cbb5d8648c3a41 (diff)
downloadmoa-id-spss-a4b6ed0c8098600a19b122ae819e342b324ba66e.tar.gz
moa-id-spss-a4b6ed0c8098600a19b122ae819e342b324ba66e.tar.bz2
moa-id-spss-a4b6ed0c8098600a19b122ae819e342b324ba66e.zip
Merge remote-tracking branch 'remotes/origin/MOAID-62'
Conflicts: id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule
Diffstat (limited to 'build.bat')
0 files changed, 0 insertions, 0 deletions