Merge remote-tracking branch 'origin/develop'

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
commit 7b5a6a0085

View file

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