DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-14 15:33:54 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	resources/views/partials/forms/edit/company-select.blade.php
This commit is contained in:
snipe 2021-06-23 14:30:31 -07:00
parent a521ef706f 1bc4d1b997
commit 7b5a6a0085
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Models/Accessory.php
View file

@ -91,6 +91,7 @@ class Accessory extends SnipeModel
'supplier_id', 'supplier_id',
'image', 'image',
'qty', 'qty',
'min_amt',
'requestable' 'requestable'
]; ];