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
..
assets	Move Google Login prompt higher, made it bigger	2024-01-05 14:56:34 +00:00
lang	Merge branch 'develop' into saving_custom_report_template	2024-01-23 13:55:07 -08:00
macros
views	Merge branch 'develop' into saving_custom_report_template	2024-01-23 13:55:07 -08:00