Marcus Moore 6521c02526 Merge branch 'develop' into livewire-importer-improvements ... # Conflicts: # resources/views/livewire/importer.blade.php		2024-08-07 15:20:39 -07:00
..
accessories	Added translation	2024-07-18 03:48:42 +01:00
asset_maintenances
categories
companies
components
consumables	Nicer consumables layout	2024-07-20 16:11:45 +01:00
custom_fields	Missing string	2024-07-16 21:14:41 +01:00
departments
depreciations
groups
hardware	Merge branch 'develop' into livewire-importer-improvements	2024-08-07 15:20:39 -07:00
kits
labels
licenses	Cleared up language	2024-07-16 21:11:03 +01:00
locations
manufacturers
models
reports
settings	adds migration and translations	2024-08-06 11:07:39 -07:00
statuslabels
suppliers
users