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
..
web	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
api.php	Fixed Groups route	2021-09-24 04:12:07 -07:00
console.php	Shift console routes	2021-06-10 20:17:20 +00:00
web.php	Added new backup routes	2021-11-09 19:39:50 -08:00