Merge branch 'develop' into feature/react-admin

2021-01-27 23:18:06 -07:00 · 2021-01-27 23:18:06 -07:00 · b856ab17bd
commit b856ab17bd
parent 31c26a2de4 5515871b2f
39 changed files with 438 additions and 359 deletions
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@ -88,7 +88,7 @@ class ResetPasswordController extends Controller
     * form with a note telling them their password was changed and to log back in.
     *
     * @param \Illuminate\Contracts\Auth\CanResetPassword|\Pterodactyl\Models\User $user
-     * @param string                                                               $password
+     * @param string $password
     *
     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException