Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
snipe 2021-04-20 14:44:01 -07:00
commit e4acf8d795

View file

@ -221,7 +221,7 @@ View Assets for {{ $user->present()->fullName() }}
@foreach ($user->consumables as $consumable)
<tr>
<td>{{ $consumable->name }}</td>
<td>{{ $consumable->category->name }}</td>
<td>{{ (($consumable->category) ? $consumable->category->name : 'deleted category') }}</td>
</tr>
@endforeach
</tbody>