Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2022-05-23 20:15:33 -07:00
commit e4e32307de

View file

@ -49,8 +49,8 @@
<th class="col-md-2">Item Name</th>
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
<th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/form.requesting_user') }}</th>
<th class="col-md-2">{{ trans('admin/hardware/form.requested_date') }}</th>
<th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
<th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
<th class="col-md-1"></th>
<th class="col-md-1"></th>
</tr>