Merge branch 'develop' into add-display-name-to-users-fixed

This commit is contained in:
snipe
2025-08-25 15:28:20 +01:00
committed by GitHub
46 changed files with 19958 additions and 1191 deletions
@@ -146,6 +146,7 @@ class AssetsController extends Controller
'model.category',
'model.manufacturer',
'model.fieldset',
'model.depreciation',
'supplier'
); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.