snipe 5bc5e9f108 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/lang/en/admin/locations/general.php		2022-06-05 17:14:31 -07:00
..
account	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
admin	Merge remote-tracking branch 'origin/develop'	2022-06-05 17:14:31 -07:00
auth	Updated language strings	2022-05-24 15:07:14 -07:00
partials/forms	Updated language strings	2022-05-24 15:07:14 -07:00
auth.php	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
button.php	Updated language strings	2022-01-28 12:40:03 -08:00
general.php	Added explicit “Example:” text in placeholders	2022-06-03 11:25:18 -07:00
help.php	Updated language strings	2022-01-28 12:40:03 -08:00
mail.php	Updated language strings	2022-01-28 12:40:03 -08:00
pagination.php	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
passwords.php	Updated language string	2022-02-11 15:55:42 -08:00
reminders.php	Updated language strings	2022-05-24 15:07:14 -07:00
table.php	Updated language strings	2022-05-24 15:07:14 -07:00
validation.php	Added the validation strings for user creation password options	2022-06-03 12:00:56 -07:00