Merge remote-tracking branch 'origin/master' into develop

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/permissions.php
2022-05-12 09:31:42 -07:00
parent 714f6d80f2 722e88a472
commit ef1eb15a91
3 changed files with 21 additions and 7 deletions
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Kits;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Models\PredefinedKit;
+use App\Models\Asset;
 use App\Models\PredefinedLicence;
 use App\Models\PredefinedModel;
 use App\Models\User;