snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php		2021-11-15 19:24:38 -08: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	2021-11-15 19:24:38 -08:00
edit-form.blade.php	Updated more fa icons	2021-09-26 01:11:08 -07:00
setup.blade.php	Fixed #8442 - wrong CSS url path on /setup	2020-09-16 11:20:59 -07:00