Jack Goh 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend ...

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	database/seeds/DatabaseSeeder.php
#	resources/assets/js/pages/admin/booking/verification.vue

2018-06-26 14:43:53 +08:00

..

factories

Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA

2018-06-26 12:19:52 +08:00

migrations

fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller

2018-06-26 12:28:17 +08:00

seeds

Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend

2018-06-26 14:43:53 +08:00

.gitignore

init

2018-04-20 14:03:37 +08:00