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
..
basic.blade.php	Basic Laravel7 compatibility, starting getting Livewire going	2021-06-28 21:00:16 -07:00
debug.blade.php	Misc debug template for use with debugging CSV exports, etc	2016-09-12 14:05:31 -07:00
default.blade.php	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
edit-form.blade.php	Updated more fa icons	2021-09-26 01:11:08 -07:00
setup.blade.php	Added localized strings for layouts	2021-11-02 14:45:58 +01:00