Jack Goh 3f37b50c5c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci ...

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	app/Http/Kernel.php
#	composer.lock

2018-07-31 16:30:26 +08:00

..

Controllers

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

2018-07-31 16:30:26 +08:00

Middleware

revert back previous changes. Add tymon to config/app.php

2018-06-22 22:52:06 +08:00

Kernel.php

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

2018-07-31 16:30:26 +08:00