Merge branch 'develop' into dane/restore-backups

2021-01-30 10:10:29 -08:00 · 2021-01-30 10:10:29 -08:00 · be26921fcc
commit be26921fcc
parent 0dd0f09238 8c2d1cdffc
41 changed files with 440 additions and 362 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