snipe e321aeabae Merge branch 'master' into integrations/2020-08-31-v5-rc ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.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/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.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/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.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 # routes/web/fields.php # tests/unit/UserTest.php		2020-08-31 12:14:44 -07:00
..
ISSUE_TEMPLATE	Update issue templates	2018-05-01 21:01:27 -07:00
autolabeler.yml	Added autolabeler for PRs	2019-02-14 13:57:07 -08:00
CODEOWNERS	Added @uberbrady as code owner of custom fields API too	2017-07-07 17:10:23 -07:00
config.yml	Config for new bots	2018-07-31 17:40:32 -07:00
FUNDING.yml	Create FUNDING.yml	2019-03-04 23:57:17 -08:00
ISSUE_TEMPLATE.md	Fixed issue template with correct path to storage logs	2018-01-19 16:31:01 -08:00
pull_request_template.md	Small edits to PR template	2020-07-31 17:02:33 -07:00
stale.yml	Updated to stale.yml	2018-07-18 02:57:05 -07:00
travis-memory.ini	Disable broken tests (#5073)	2018-02-22 21:46:58 -08:00
weekly-digest.yml	Added weekly digest app for repo	2019-02-14 13:52:56 -08:00