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
..
Console	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Events	Valo/checkin date in history of asset (#6733)	2019-03-13 21:36:32 -07:00
Exceptions	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Helpers	Add write-only image_source field for asset create/edit API endpoint (#6146)	2019-03-13 21:00:40 -07:00
Http	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
Importer	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Jobs	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
LegacyEncrypter	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Listeners	Valo/checkin date in history of asset (#6733)	2019-03-13 21:36:32 -07:00
Models	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
Notifications	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Observers	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Policies	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
Presenters	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
Providers	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
Services	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00