10 Commits

Author SHA1 Message Date
Digital Data - Marlon Schreiber
e09488a06b MS 2017-11-08 15:02:30 +01:00
JenneJ
8313ce9d7e reset merge test 2017-02-15 16:36:17 +01:00
Digital Data
d2310ea20b Merge branch 'master' of http://172.24.11.74:90/scm/git/ZsgImport
# Conflicts:
#	app/ZSG_Import/MyService.vb
2017-02-15 16:34:31 +01:00
JenneJ
045edda55a Merge branch 'master' of http://172.24.11.74:90/scm/git/ZsgImport 2017-02-15 16:27:47 +01:00
JenneJ
c38f0cbd47 merge test jonathan 2017-02-15 16:27:40 +01:00
Digital Data
288fc2591a merge test dominik 2017-02-15 16:26:10 +01:00
Digital Data
7ef30a4214 test 2017-02-15 16:22:28 +01:00
JenneJ
c6b7ee3693 jj 31.08 add setup 2016-08-31 16:09:16 +02:00
SchreiberM
ed3f4a1cd2 MS 2016-08-31 13:09:10 +02:00
SchreiberM
cea9afcc22 ms 2016-08-29 14:45:57 +02:00