mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-11 16:14:18 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
5a43c5906f
|
@ -215,6 +215,7 @@ class Importer extends Component
|
||||||
'manufacturer' => trans('general.manufacturer'),
|
'manufacturer' => trans('general.manufacturer'),
|
||||||
'order_number' => trans('general.order_number'),
|
'order_number' => trans('general.order_number'),
|
||||||
'image' => trans('general.importer.image_filename'),
|
'image' => trans('general.importer.image_filename'),
|
||||||
|
'asset_eol_date' => trans('admin/hardware/form.eol_date'),
|
||||||
/**
|
/**
|
||||||
* Checkout fields:
|
* Checkout fields:
|
||||||
* Assets can be checked out to other assets, people, or locations, but we currently
|
* Assets can be checked out to other assets, people, or locations, but we currently
|
||||||
|
|
Loading…
Reference in a new issue