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

..

assets

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

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

lang

integrated frontend

2018-05-07 15:26:23 +08:00

views

added booking list controller

2018-06-20 22:21:45 +08:00