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
..
bulk-edit.blade.php	Use the same string for both radio buttons in bulk user edit	2022-03-29 16:45:55 +01:00
confirm-bulk-delete.blade.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
edit.blade.php	Add remote option to user	2022-03-04 05:35:26 -08:00
index.blade.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
ldap.blade.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
print.blade.php	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
view.blade.php	FIX: #10898 (invalid consumable date time info in user view)	2022-04-05 15:31:27 +07:00