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/Exceptions/DisplayException.php
+++ b/app/Exceptions/DisplayException.php
@ -26,7 +26,7 @@ class DisplayException extends PterodactylException
     *
     * @param string $message
     * @param string $level
-     * @param int    $code
+     * @param int $code
     */
    public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR, $code = 0)
    {