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
..
category.blade.php	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
kit-accessory.blade.php	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
kit-consumable.blade.php	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
kit-license.blade.php	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
kit-model.blade.php	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
location.blade.php	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07:00
manufacturer.blade.php	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
model.blade.php	Merge branch 'develop' into integrations/2020-08-31-dev-into-master	2020-08-31 12:44:03 -07:00
statuslabel.blade.php	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
supplier.blade.php	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
upload-file.blade.php	We accept xlsx in uploads	2020-05-23 11:36:47 -04:00
user.blade.php	Squashed commit of the following:	2020-08-31 12:17:19 -07:00