4d003ac97a
# Conflicts: # app/Http/Controllers/Auth/ResetPasswordController.php # config/version.php
# Conflicts: # app/Http/Controllers/Auth/ResetPasswordController.php # config/version.php