mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-31 08:27:39 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
ead5f039b4
|
@ -214,7 +214,6 @@ class Importer extends Component
|
||||||
'model_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
|
'model_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
|
||||||
'manufacturer' => trans('general.manufacturer'),
|
'manufacturer' => trans('general.manufacturer'),
|
||||||
'order_number' => trans('general.order_number'),
|
'order_number' => trans('general.order_number'),
|
||||||
'notes' => trans('general.notes'),
|
|
||||||
'image' => trans('general.importer.image_filename'),
|
'image' => trans('general.importer.image_filename'),
|
||||||
/**
|
/**
|
||||||
* Checkout fields:
|
* Checkout fields:
|
||||||
|
|
Loading…
Reference in a new issue