mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-14 17:44:17 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
090410edb5
|
@ -32,6 +32,7 @@ use Illuminate\Support\Facades\Http;
|
|||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
|
||||
/**
|
||||
* This controller handles all actions related to Settings for
|
||||
|
@ -1116,7 +1117,7 @@ class SettingsController extends Controller
|
|||
* @author [A. Gianotto] [<snipe@snipe.net>]
|
||||
* @since [v1.8]
|
||||
*/
|
||||
public function downloadFile($filename = null) : RedirectResponse
|
||||
public function downloadFile($filename = null) : RedirectResponse | BinaryFileResponse
|
||||
{
|
||||
$path = 'app/backups';
|
||||
|
||||
|
|
Loading…
Reference in a new issue