Jack Goh 560035be09 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage ...

# Conflicts:
#	package-lock.json
#	package.json
#	resources/assets/js/pages/settings/admin-supplier.vue
#	vendor/composer/autoload_static.php

2018-07-05 11:52:38 +08:00

..

ForgotPasswordController.php

rollback reset password

2018-06-13 16:44:57 +08:00

LoginController.php

integrated frontend

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

OAuthController.php

comment name column in oauthctroller

2018-07-03 23:08:34 +08:00

RegisterController.php

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

2018-07-05 11:52:38 +08:00

ResetPasswordController.php

Fix test

2018-06-13 15:57:08 +08:00