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
..
bulk-edit.blade.php	Added checkboxes to intentionally remove field values in bulk user edit	2023-10-31 12:52:53 +00:00
confirm-bulk-delete.blade.php	forgot to remove comment line	2024-02-06 13:05:04 -08:00
confirm-merge.blade.php	Added employee number to user merge screeb	2023-11-03 20:09:11 +00:00
edit.blade.php	Only offer the 2FA reset if the user already has 2FA set up	2024-03-20 23:52:51 +00:00
index.blade.php	adds shortcuts for listing, creating, and saving	2022-10-11 12:00:15 -07:00
ldap.blade.php	allows multi location sync for ldap	2023-11-02 16:50:19 -07:00
print.blade.php	Remove alpine reference from webpack	2024-05-29 12:30:20 -07:00
view.blade.php	Small tweaks to user export, user view translations	2024-05-30 13:59:00 +01:00