DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 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->id }}</td>
<td>{{ $asset->present()->name() }}</td> <td>{{ $asset->present()->name() }}</td>
<td> <td>
@if ($asset->assetloc) @if ($asset->location)
{{ $asset->assetloc->name }} {{ $asset->location->name }}
@endif @endif
</td> </td>
<td> <td>