snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop ... # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json		2019-03-20 02:17:02 -07:00
..
AssetCheckinController.php	Valo/checkin date in history of asset (#6733)	2019-03-13 21:36:32 -07:00
AssetCheckoutController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetFilesController.php	Put file contents instead of file object (creates subdirectory with a single file) (#6760)	2019-03-05 12:08:18 -08:00
AssetsController.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
BulkAssetsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00