12ae408830
# Conflicts: # app/Http/Controllers/Auth/ResetPasswordController.php # resources/views/auth/passwords/reset.blade.php