4 Commits

Author	SHA1	Message	Date
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
Jack Goh	72a4f6645f	Added marking to admin home page ... Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2018-07-08 10:53:24 +08:00
Too	30b72fe2cb	uncomment failed test	2018-06-22 22:18:06 +08:00
jack	a1db64d1c1	integrated frontend	2018-05-07 15:26:23 +08:00