snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration ... # Conflicts: # .env.example # .travis.yml # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Middleware/EncryptCookies.php # app/Http/Requests/AssetRequest.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/AssetImporter.php # app/Models/AssetMaintenance.php # app/Models/Location.php # app/Models/User.php # composer.json # composer.lock # config/backup.php # config/database.php # config/version.php # public/mix-manifest.json # resources/lang/en-ID/general.php # resources/lang/vi/admin/settings/general.php # resources/views/accessories/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # tests/api/ApiCategoriesCest.php		2019-11-18 19:49:39 -08:00
..
AppServiceProvider.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AuthServiceProvider.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
EventServiceProvider.php	(develop) Fix asset auto-incrementation (#6806)	2019-03-13 10:58:35 -07:00
LdapServiceProvider.php	LDAP fixes (#6533)	2019-01-10 13:20:43 -08:00
MacroServiceProvider.php
RouteServiceProvider.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SettingsServiceProvider.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
ValidationServiceProvider.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00