snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js		2022-05-06 01:52:43 -07:00
..
account	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
admin	Changed language string	2022-05-05 10:52:57 -07:00
auth	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
partials/forms	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08: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	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -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	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
table.php	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
validation.php	Updated language strings	2022-01-28 12:40:03 -08:00