snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php		2022-03-03 21:59:38 -08:00
..
AccessoryImporter.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
AssetImporter.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
ComponentImporter.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ConsumableImporter.php	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00
import_mappings.md	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00
Importer.php	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
ItemImporter.php	Separate notes on assets and asset models	2022-02-24 16:05:03 -06:00
LicenseImporter.php	Tweak query in the License Importer to not require a Product Key	2022-01-26 17:51:04 -06:00
UserImporter.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00