Marcus Moore 1736bf5510 Merge branch 'develop' into chore/sc-23725/livewire3 ... # Conflicts: # app/Livewire/LoginForm.php # package.json # resources/views/livewire/login-form.blade.php		2024-05-30 16:56:50 -07:00
..
assets	Fix select2 re-renders	2024-05-30 16:20:04 -07:00
lang
macros
views	Merge branch 'develop' into chore/sc-23725/livewire3	2024-05-30 16:56:50 -07:00