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
..
css	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
fonts	Added: #6246 - CSS Cleanup (#6247)	2018-09-28 14:09:48 -07:00
img	Added accessories images for seeder	2018-09-29 22:17:14 -07:00
js	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
uploads	Seed with demo images	2017-10-28 05:46:43 -07:00
.htaccess	Port/reenable most unit tests. (#5921)	2018-07-23 06:48:21 -07:00
favicon.ico	Updated favicon with new branding	2018-12-05 18:55:23 -08:00
index.php	Updated email addy	2016-12-14 04:38:03 -08:00
mix-manifest.json	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
robots.txt	Disallow / in robots	2017-09-28 17:47:48 -07:00
web.config	Fix for IIS+ Chrome not showing webfonts	2017-11-06 16:51:46 -08:00