Merge branch 'develop' into feature/vuejs

2026-04-14 04:13:46 +02:00 · 2018-12-16 14:20:35 -08:00
parent cc7f7d7123 f6d0147419
commit 21ffa08d66
54 changed files with 407 additions and 243 deletions
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -27,7 +27,7 @@ class ForgotPasswordController extends Controller
        // exist on the system.
        event(new FailedPasswordReset($request->ip(), $request->input('email')));

-        return $this->sendResetLinkResponse(Password::RESET_LINK_SENT);
+        return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
    }

    /**