54503caf45
# Conflicts: # app/Http/Controllers/AuthController.php # lang/en/api.php # lang/fr/api.php # tests/Feature/EmailVerificationTest.php