Marcus Moore 530ea474d1 Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # resources/lang/en/admin/reports/general.php # resources/views/reports/custom.blade.php		2024-01-23 13:55:07 -08:00
..
edit	Merge branch 'develop' into saving_custom_report_template	2024-01-23 13:55:07 -08:00
checkout-selector.blade.php	Updated more fa icons	2021-09-26 01:11:08 -07:00
demo-mode.blade.php	Added new partial for the form inline “demo mode”	2023-03-21 18:57:27 -07:00