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
..
AccessoriesTransformer.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
ActionlogsTransformer.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
AssetMaintenancesTransformer.php
AssetModelsTransformer.php
AssetsTransformer.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
CategoriesTransformer.php
CompaniesTransformer.php
ComponentsAssetsTransformer.php
ComponentsTransformer.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
ConsumablesTransformer.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
CustomFieldsetsTransformer.php
CustomFieldsTransformer.php
DatatablesTransformer.php
DepartmentsTransformer.php
DepreciationReportTransformer.php	Use Helper alias	2021-09-28 19:44:55 -07:00
DepreciationsTransformer.php
GroupsTransformer.php	Merge master into develop	2022-01-12 20:51:33 -08:00
ImportsTransformer.php
LicenseSeatsTransformer.php
LicensesTransformer.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
LocationsTransformer.php
LoginAttemptsTransformer.php
ManufacturersTransformer.php
PredefinedKitsTransformer.php
SelectlistTransformer.php
StatuslabelsTransformer.php
SuppliersTransformer.php
UsersTransformer.php