Merge branch 'develop'

This commit is contained in:
snipe 2017-11-09 14:42:19 -08:00
commit 7eb94d16a1

View file

@ -41,7 +41,7 @@
<td>{{ $assetItem->model->name }}</td>
<td>{!! $assetItem->present()->nameUrl() !!}</td>
<td>{{ $assetItem->asset_tag }}</td>
<td>{!! $assetItem->assignedTo->present()->nameUrl() !!}</td>
<td>{!! ($assetItem->assignedTo) ? $assetItem->assignedTo->present()->nameUrl() : 'Deleted user' !!}</td>
</tr>
@endforeach
@endif