snipe 9f3a8a43cc Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # composer.lock		2021-03-17 19:41:02 -07:00
..
AccessoriesController.php
AssetMaintenancesController.php
AssetModelsController.php
AssetsController.php
CategoriesController.php
CompaniesController.php
ComponentsController.php
ConsumablesController.php
CustomFieldsController.php
CustomFieldsetsController.php
DepartmentsController.php
DepreciationsController.php
GroupsController.php
ImportController.php
LicensesController.php
LocationsController.php	Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. (#9210)	2021-02-26 12:56:04 -08:00
ManufacturersController.php
PredefinedKitsController.php
ProfileController.php
ReportsController.php
SettingsController.php	Changed debug level on bad LDAP connection (#9314)	2021-03-17 19:24:28 -07:00
StatuslabelsController.php	Fixed #9266 - set a colors_array variable even if other conditions are not met	2021-03-09 21:04:32 -08:00
SuppliersController.php
UsersController.php