Godfrey M a1429ce86b removed manager_name from user files		2022-03-24 11:47:13 -07:00
..
AccessoriesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
AssetModelsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
AssetsController.php	Apply the fix to API controller too :(	2022-03-19 23:12:48 +00:00
CategoriesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
CompaniesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
ComponentsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
ConsumablesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
CustomFieldsController.php
CustomFieldsetsController.php
DepartmentsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
DepreciationsController.php
GroupsController.php
ImportController.php
LicensesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
LicenseSeatsController.php
LocationsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
ManufacturersController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
PredefinedKitsController.php	Merge master into develop	2022-01-12 20:51:33 -08:00
ProfileController.php
ReportsController.php
SettingsController.php	Ahem.	2022-02-10 22:43:51 -08:00
StatuslabelsController.php	Removed extra space because pedantry	2022-03-16 16:45:03 +00:00
SuppliersController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
UsersController.php	removed manager_name from user files	2022-03-24 11:47:13 -07:00