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
..
forms/asset-models	Tweaked custom field default value layout	2018-07-05 15:31:27 -07:00
importer	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
passport	Pass urls to passport vue components to make work in subdirectories. (#4090)	2017-10-01 13:59:07 -07:00
alert.vue	Vue importer (#3235)	2017-01-25 21:29:23 -08:00
select2.vue	Importer mapping - v1 (#3677)	2017-06-21 16:37:37 -07:00