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
..
Feature	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
Support	adds setEula to support\settings	2024-09-04 12:26:44 -07:00
Unit	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
CreatesApplication.php	renamed Tests to tests	2021-12-02 15:08:26 -08:00
TestCase.php	Extract CanSkipTests trait	2024-04-22 10:32:37 -07:00