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
..
AdminLTE.css	Merge master into develop	2022-01-12 20:51:33 -08:00
AdminLTE.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
all.css	Fix for weird padlock display in asset listing with encrypted custom fields	2020-06-22 20:29:19 -07:00
app.css	Merge master into develop	2022-01-12 20:51:33 -08:00
app.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
bootstrap.css	Fixed Tooltips and Rounded corners from previous cleanup (#6285)	2018-10-03 13:17:08 -07:00
fontawesome.css	Updated fontawesome icons	2021-09-24 06:07:46 -07:00
overrides.css	Merge master into develop	2022-01-12 20:51:33 -08:00