Marcus Moore 8bba11e1bb Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # app/Http/Controllers/ReportsController.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/status-select.blade.php # resources/views/reports/custom.blade.php		2024-09-17 15:26:35 -07:00
..
accessories.blade.php
activity.blade.php	Moar icon replacement	2024-08-18 18:13:49 +01:00
asset.blade.php
asset_maintenances.blade.php	Fixed case in BS table formatter for boolean	2023-08-14 13:01:32 +01:00
audit.blade.php	fixed audit log image not appearing	2023-06-12 12:10:19 -07:00
custom.blade.php	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
depreciation.blade.php
index.blade.php
licenses.blade.php
unaccepted_assets.blade.php	Set resend acceptance to POST	2023-10-09 16:13:41 +01:00