Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2016-07-30 17:27:29 -07:00
commit d65a9091c8

View file

@ -249,7 +249,7 @@
<td>{{ trans('admin/hardware/form.notes') }}</td>
<td> {!! nl2br(e($asset->notes)) !!}</td>
</tr>
@if ($asset->created_at!=''')
@if ($asset->created_at!='')
<tr>
<td>{{ trans('general.created_at') }}</td>
<td>