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
..
skin-black-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-black-dark.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-black-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-black.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-black.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-black.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-blue-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-blue-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-blue.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-blue.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-blue.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-contrast.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-contrast.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-contrast.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-green-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-green-dark.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-green-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-green.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-green.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-green.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-orange-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-orange-dark.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-orange-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-orange.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-orange.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-orange.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-purple-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-purple-dark.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-purple-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-purple.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-purple.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-purple.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-red-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-red-dark.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-red-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-red.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-red.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-red.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-yellow-dark.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-yellow-dark.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-yellow-dark.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-yellow.css	Merge master into develop	2022-01-12 20:51:33 -08:00
skin-yellow.css.map	Updated generated assets	2020-04-23 22:46:41 -07:00
skin-yellow.min.css	Merge master into develop	2022-01-12 20:51:33 -08:00