Jack Goh 90fcbcda73 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking ...

# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php

2018-06-13 14:43:30 +08:00

..

ForgotPasswordController.php

updated readme

2018-06-12 09:46:42 +08:00

LoginController.php

integrated frontend

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

OAuthController.php

integrated frontend

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

RegisterController.php

added wait for mysql to start in docker

2018-05-14 12:45:30 +08:00

ResetPasswordController.php

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

2018-06-13 14:43:30 +08:00