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

..

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

added back name field to user table

2018-07-05 13:27:38 +08:00

RegisterController.php

temporary fix register page

2018-07-30 13:49:35 +08:00

ResetPasswordController.php

Fix test

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