Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-02-05 19:13:17 +00:00
commit c0fbf106ed
2 changed files with 2 additions and 2 deletions

View file

@ -616,7 +616,7 @@ class ReportsController extends Controller
}
if ($request->filled('url')) {
$header[] = trans('admin/manufacturers/table.url');
$header[] = trans('general.url');
}

View file

@ -45,7 +45,7 @@ class ManufacturerPresenter extends Presenter
'searchable' => true,
'sortable' => true,
'switchable' => true,
'title' => trans('admin/manufacturers/table.url'),
'title' => trans('general.url'),
'visible' => true,
'formatter' => 'externalLinkFormatter',
],