snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop ... # Conflicts: # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/LicensesController.php # composer.json # composer.lock # config/version.php # resources/views/auth/two_factor_enroll.blade.php		2019-05-06 08:45:13 -04:00
..
AccessoriesController.php	Remove old redundant code in LicensesController, added an offset to AccessoriesController for pagination to work correctly (#6847)	2019-04-02 10:13:58 -07:00
AssetMaintenancesController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetModelsController.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
AssetsController.php	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
CategoriesController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CompaniesController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ComponentsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ConsumablesController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CustomFieldsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CustomFieldsetsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DepartmentsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DepreciationsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
GroupsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ImportController.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
LicensesController.php	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
LocationsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ManufacturersController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
PredefinedKitsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ProfileController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ReportsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SettingsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
StatuslabelsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SuppliersController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
UsersController.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00