Merge branch 'develop' into fix_setup_ssl_check

This commit is contained in:
Brady Wetherington
2024-07-23 20:24:38 +01:00
527 changed files with 9334 additions and 1421 deletions
@@ -206,7 +206,7 @@ class AssetsController extends Controller
if ($success) {
return redirect()->route('hardware.index')
->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset->id), 'id', 'tag' => e($asset->asset_tag)]));
->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', ['hardware' => $asset->id]), 'id', 'tag' => e($asset->asset_tag)]));
}