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
..
build	Merge master into develop	2022-01-12 20:51:33 -08:00
dist	Merge master into develop	2022-01-12 20:51:33 -08:00
fonts	Fixed font awesome caret	2021-09-25 23:17:35 -07:00
skins	undid the color change for links, darkened the back-sub-alt	2021-06-23 16:29:21 -07:00
blue.png	Ficing webpack, CSS and JS (*whew* that sucked)	2020-04-27 22:41:33 -07:00
blue@2x.png	Ficing webpack, CSS and JS (*whew* that sucked)	2020-04-27 22:41:33 -07:00
overrides.css	Squashed commit of the following:	2020-08-31 12:17:19 -07:00
overrides.css.map	Squashed commit of the following:	2020-08-31 12:17:19 -07:00
signature-pad.css	Fixed #5319 - signature pad too small on mobile	2018-04-06 19:19:31 -07:00
signature-pad.min.css	Added signature-pad.min.css to the css directory - should possibly fix #8603	2020-11-02 23:57:39 -08:00