Merge branch 'master' of github.com:snipe/snipe-it

This commit is contained in:
snipe 2016-10-26 10:09:59 -07:00
commit ad1d6529a7

View file

@ -314,7 +314,7 @@
</tr>
@endif
@if ($asset->assetloc)
@if ($asset->defaultLoc)
<tr>
<td>{{ trans('admin/hardware/form.default_location') }}</td>
<td>