Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into Label_customization

Godfrey M70f03bca700e
diff --cc app/Http/Controllers/SettingsController.php
index df3d0a6850,622186eb9a..f14c0af075
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@@ -35,8 -35,8 +35,9 @@@ use Illuminate\Support\Str
use Illuminate\Validation\Rule;
use League\Csv\EscapeFormula;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
+ use Symfony\Component\HttpFoundation\StreamedResponse;
use ZipArchive;
+use App\Models\Labels\CustomUserLabel;
/**
* This controller handles all actions related to Settings for