andreas
|
ff5dc64ec1
|
Resolved Merge Conflict
|
2020-12-18 13:48:13 +01:00 |
|
andreas
|
0c9c7584f8
|
Merged .gitignore
|
2020-12-18 13:47:59 +01:00 |
|
andreas
|
49987cdb9e
|
removed .vs
|
2020-12-18 13:25:29 +01:00 |
|
andreas
|
c7190b4479
|
Merge branch 'DevMathieu' of github.com:Xandra10101/AlfaPrentice into DevMathieu
|
2020-12-18 13:24:08 +01:00 |
|
andreas
|
23f35b17c0
|
removed old BedrijfController and the folder structure associated with it
|
2020-12-18 13:22:18 +01:00 |
|
andreas
|
fa3ac2dd0e
|
removed obj
|
2020-12-18 13:18:51 +01:00 |
|
andreas
|
7e8ef43f35
|
merged DevMathieu into DevFix
|
2020-12-18 13:18:11 +01:00 |
|