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

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2024-08-16 16:18:00 +01:00
parent c1caf6088e 43b338d612
commit bb1385369c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en-US/general.php
View file

@ -560,5 +560,6 @@ return [
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
];

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

@ -1030,7 +1030,7 @@
<div class="row hidden-print">
<div class="col-md-3">
<strong>
{{ trans('general.labels') }}
{{ trans('general.label') }}
</strong>
</div>
<div class="col-md-9 hidden-print">