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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-07-30 17:27:29 -07:00
parent 4e4f338680 1f30bdee99
commit d65a9091c8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/hardware/view.blade.php
View file

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