Marcus Moore 5306e1cd15 Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/reports/custom.blade.php		2024-10-15 12:32:01 -07:00
..
account	Added confetti option	2024-08-15 11:32:42 +01:00
admin	Merge branch 'develop' into saving_custom_report_template	2024-10-15 12:32:01 -07:00
auth	More strings	2024-06-20 15:40:38 +01:00
auth.php	Use correct language codes, updated strings	2023-12-19 17:23:16 +00:00
button.php	Fixed string	2024-07-23 20:45:12 +01:00
general.php	Added checkin action on delete for checked out assets	2024-10-01 14:29:02 +01:00
help.php	Use correct language codes, updated strings	2023-12-19 17:23:16 +00:00
localizations.php	Updated blade selectors	2024-08-29 18:31:34 +01:00
mail.php	Fixed typo	2024-08-29 20:05:03 +01:00
pagination.php	Use correct language codes, updated strings	2023-12-19 17:23:16 +00:00
passwords.php	Use correct language codes, updated strings	2023-12-19 17:23:16 +00:00
reminders.php	Use correct language codes, updated strings	2023-12-19 17:23:16 +00:00
table.php	Translate no records found message	2024-05-20 11:19:47 +01:00
validation.php	Fixed translations	2024-10-09 20:33:15 +01:00