DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 16:27:35 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-02 12:50:56 -07:00
parent ffd93c59d6 d21c92f91b
commit cf09908c60
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/hardware/bulk-delete.blade.php
View file

@ -42,8 +42,8 @@
<td>{{ $asset->id }}</td>
<td>{{ $asset->present()->name() }}</td>
<td>
@if ($asset->assetloc)
{{ $asset->assetloc->name }}
@if ($asset->location)
{{ $asset->location->name }}
@endif
</td>
<td>