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
..
app.js	Updated snipeit.js with "restore" modal code	2021-11-09 22:39:33 -08:00
app.js.LICENSE.txt	Revert tableexport	2021-11-03 16:17:19 -07:00
vendor.js	Updated assets	2021-09-24 02:16:58 -07:00
vue.js	Updated more fa icons	2021-09-26 01:11:08 -07:00