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
..
Controllers	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Livewire	Add an early return if the model id is not set (for new Asset Models)	2022-01-21 11:45:45 -06:00
Middleware	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
Requests	Removed debugging line	2022-02-16 13:47:22 -08:00
Traits	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
Transformers	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Kernel.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00