Jack Goh fcfecb83d3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug ...

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	resources/assets/js/pages/home.vue

2018-07-26 15:50:49 +08:00

..

components

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug

2018-07-26 15:50:49 +08:00

lang

integrated frontend

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

layouts

integrated frontend

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

middleware

solved merge conflict

2018-06-26 10:40:35 +08:00

pages

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug

2018-07-26 15:50:49 +08:00

plugins

complete the admin setting navbar

2018-06-25 16:57:18 +08:00

router

git pull origin master

2018-07-20 22:12:48 +08:00

store

Remove some unnessary console.log

2018-07-19 18:01:16 +08:00

app.js

removed vee-validate which causes cief bank details not showing in user upload bank slip

2018-07-25 16:22:53 +08:00