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
..
assets	Some CSS tweaks for select2	2024-08-29 17:52:01 +01:00
lang	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
macros	Updated blade selectors	2024-08-29 18:31:34 +01:00
views	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00