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
..
web	failing ui test	2024-08-14 18:14:21 -05:00
api.php	Added tests	2024-09-02 18:51:22 +01:00
console.php	Added parens	2023-02-06 12:39:22 -08:00
scim.php	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end	2022-04-05 20:26:37 +01:00
web.php	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00