Jack Goh c59fb24537 Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses ...

# Conflicts:
#	app/Http/Controllers/CompanyController.php
#	package-lock.json
#	routes/api.php

2018-06-20 11:32:02 +08:00

..

factories

merged master

2018-06-20 11:26:23 +08:00

migrations

Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses

2018-06-20 11:32:02 +08:00

seeds

fix seeding for testing

2018-06-12 15:23:17 +08:00

.gitignore

init

2018-04-16 15:37:03 +08:00