2 Commits

Author SHA1 Message Date
Aqeeb Imtiaz Harun 3c1f2c522d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact
# Conflicts:
#	Dockerfile
#	app/Company.php
#	app/Http/Controllers/CompanyController.php
#	app/Http/Kernel.php
#	app/User.php
#	composer.json
#	composer.lock
#	config/app.php
#	package-lock.json
#	routes/api.php
#	tests/TestCase.php
2018-06-12 09:28:51 +08:00
Asif c0dab3c496 contact migration 2018-05-14 16:23:56 +08:00