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
..
assets	Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop	2022-04-05 21:11:24 +01:00
lang	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
macros	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]	2021-08-17 21:59:33 -07:00
views	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00