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
..
build	Updated assets	2022-01-21 12:33:49 -08:00
dist	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
fonts	Fixed font awesome caret	2021-09-25 23:17:35 -07:00
skins
blue.png
blue@2x.png
overrides.css
overrides.css.map
signature-pad.css
signature-pad.min.css