snipe-it/app/Http/Controllers/Api
snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
..
AccessoriesController.php
AssetMaintenancesController.php
AssetModelsController.php
AssetsController.php Merge remote-tracking branch 'origin/master' into develop 2022-05-10 17:26:26 -07:00
CategoriesController.php
CompaniesController.php
ComponentsController.php
ConsumablesController.php
CustomFieldsController.php
CustomFieldsetsController.php
DepartmentsController.php
DepreciationsController.php
GroupsController.php
ImportController.php
LicensesController.php
LicenseSeatsController.php
LocationsController.php
ManufacturersController.php
PredefinedKitsController.php
ProfileController.php
ReportsController.php
SettingsController.php
StatuslabelsController.php
SuppliersController.php
UsersController.php