Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2016-08-02 04:26:19 -07:00
commit 846356974d

View file

@ -514,7 +514,7 @@
@if ($asset->adminuser)
{{ $asset->adminuser->fullName() }}
@else
@trans('general.unknown_admin')
{{ trans('general.unknown_admin') }}
@endif
</td>