DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-07-29 10:11:39 +01:00
parent 0dd0baa511 bc18fac97e
commit de04ead55d
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,7 +296,7 @@
</li> </li>
@endif @endif
</ul> </ul>
</div>
@endif @endif
@if ($snipeSettings->qr_code=='1') @if ($snipeSettings->qr_code=='1')
<div class="col-md-12 text-center" style="padding-top: 15px;"> <div class="col-md-12 text-center" style="padding-top: 15px;">
@ -307,6 +307,9 @@
<br><br> <br><br>
</div> </div>
<!-- End button column --> <!-- End button column -->
<div class="col-md-9 col-xs-12 col-sm-pull-3"> <div class="col-md-9 col-xs-12 col-sm-pull-3">