snipe 43c57c8461 Merge master into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php		2022-01-12 20:51:33 -08:00
..
Controllers	Merge master into develop	2022-01-12 20:51:33 -08:00
Livewire	Merge branch 'develop' into remove_old_ldap	2022-01-03 12:56:58 -08:00
Middleware	Fixed parse error for merge conflict	2021-10-28 18:04:03 -07:00
Requests	Merge master down into develop	2021-12-16 14:26:24 -08:00
Traits	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
Transformers	Merge master into develop	2022-01-12 20:51:33 -08:00
Kernel.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00