Jack Goh e8b2b8009b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into zain/shipping-order ...

# Conflicts:
#	Dockerfile
#	app/Http/Controllers/AuthController.php
#	app/User.php
#	database/factories/UserFactory.php
#	database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php
#	database/seeds/DatabaseSeeder.php
#	public/home.html
#	public/index.html
#	public/profile-first-setup.html
#	public/verify-code-number.html
#	public/verify-phone-number.html
#	routes/api.php
#	routes/web.php
#	tests/Feature/LoginTest.php
#	tests/Feature/RegisterTest.php

2018-06-28 16:58:01 +08:00

..

Feature

updated docker

2018-06-28 16:51:21 +08:00

Unit

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into zain/shipping-order

2018-06-28 16:58:01 +08:00

CreatesApplication.php

init

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

TestCase.php

updated docker

2018-06-28 16:51:21 +08:00