DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-30 07:02:20 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-03-17 02:48:51 -07:00
parent 934f43e104 c752e3bb86
commit a4e6b3c022
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/users/confirm-merge.blade.php
View file

@ -25,9 +25,11 @@
</div>
@if (config('app.lock_passwords'))
<div class="col-md-12">
<div class="callout callout-warning">
<p>{{ trans('general.feature_disabled') }}</p>
<div class="row">
<div class="col-md-12">
<div class="callout callout-info">
<p>{{ trans('general.feature_disabled') }}</p>
</div>
</div>
</div>
@endif