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
..
AccessoriesTransformer.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
ActionlogsTransformer.php
AssetMaintenancesTransformer.php
AssetModelsTransformer.php
AssetsTransformer.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
CategoriesTransformer.php
CompaniesTransformer.php
ComponentsAssetsTransformer.php
ComponentsTransformer.php
ConsumablesTransformer.php
CustomFieldsetsTransformer.php
CustomFieldsTransformer.php
DatatablesTransformer.php
DepartmentsTransformer.php
DepreciationReportTransformer.php
DepreciationsTransformer.php
GroupsTransformer.php	Merge master into develop	2022-01-12 20:51:33 -08:00
ImportsTransformer.php
LicenseSeatsTransformer.php
LicensesTransformer.php
LocationsTransformer.php
LoginAttemptsTransformer.php
ManufacturersTransformer.php
PredefinedKitsTransformer.php
SelectlistTransformer.php
StatuslabelsTransformer.php
SuppliersTransformer.php
UsersTransformer.php