Marcus Moore d4861a74df Merge branch 'develop' into chore/sc-23725/livewire3 ... # Conflicts: # composer.lock		2024-06-25 10:15:50 -07:00
..
assets	Remove commented code	2024-06-05 11:46:57 -07:00
lang	Added avif to translation string	2024-06-25 13:39:36 +01:00
macros	Added lastname.firstname as email format	2024-06-20 13:36:48 +01:00
views	Merge branch 'develop' into chore/sc-23725/livewire3	2024-06-25 10:15:50 -07:00