Merge branch 'develop' into dane/restore-backups

2021-01-25 19:16:40 -08:00 · 2021-01-25 19:16:40 -08:00 · 663143de0b
commit 663143de0b
parent f24193801a b7d1c45bcc
575 changed files with 6080 additions and 6864 deletions
--- a/app/Http/Controllers/Api/Client/Servers/BackupController.php
+++ b/app/Http/Controllers/Api/Client/Servers/BackupController.php
@ -86,8 +86,6 @@ class BackupController extends ClientApiController
    /**
     * Starts the backup process for a server.
     *
-     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Backups\StoreBackupRequest $request
-     * @param \Pterodactyl\Models\Server $server
     * @return array
     *
     * @throws \Exception|\Throwable