Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
de04ead55d
1 changed files with 11 additions and 8 deletions
|
@ -296,7 +296,7 @@
|
|||
</li>
|
||||
@endif
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
@endif
|
||||
@if ($snipeSettings->qr_code=='1')
|
||||
<div class="col-md-12 text-center" style="padding-top: 15px;">
|
||||
|
@ -307,6 +307,9 @@
|
|||
<br><br>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- End button column -->
|
||||
|
||||
<div class="col-md-9 col-xs-12 col-sm-pull-3">
|
||||
|
|
Loading…
Add table
Reference in a new issue