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/Exceptions/Http/Connection/DaemonConnectionException.php
+++ b/app/Exceptions/Http/Connection/DaemonConnectionException.php
@ -29,9 +29,6 @@ class DaemonConnectionException extends DisplayException

    /**
     * Throw a displayable exception caused by a daemon connection error.
-     *
-     * @param \GuzzleHttp\Exception\GuzzleException $previous
-     * @param bool $useStatusCode
     */
    public function __construct(GuzzleException $previous, bool $useStatusCode = true)
    {