snipe 453fc718d9 Merge branch 'develop' into integrations/2020-08-31-dev-into-master ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Models/Ldap.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # 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 # resources/assets/less/overrides.less # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # tests/unit/UserTest.php		2020-08-31 12:44:03 -07:00
..
css	Merge branch 'develop' into integrations/2020-08-31-dev-into-master	2020-08-31 12:44:03 -07:00
img	Added default logo/favicon	2020-02-11 20:15:35 -08:00
js	Merge branch 'develop' into integrations/2020-08-31-dev-into-master	2020-08-31 12:44:03 -07:00
uploads	Fixed logo uploads	2020-04-27 23:22:52 -07:00
.htaccess	Port/reenable most unit tests. (#5921)	2018-07-23 06:48:21 -07:00
favicon.ico	Default favicon	2020-02-11 20:19:24 -08:00
index.php	Updated email addy	2016-12-14 04:38:03 -08:00
mix-manifest.json	Fixed stupid import layouts	2020-08-24 21:15:46 -07:00
mix.js.map	Added resources	2020-04-22 07:15:24 -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