Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-08-11 10:26:16 +01:00
commit 1e213c31ef

View file

@ -67,7 +67,7 @@ class Actionlog extends SnipeModel
'company' => ['name'],
'admin' => ['first_name','last_name','username', 'email'],
'user' => ['first_name','last_name','username', 'email'],
'assets' => ['asset_tag','name','model', 'model_number'],
'assets' => ['asset_tag','name'],
];
/**