snipe c3d55ee27e Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php		2021-12-16 14:26:24 -08:00
..
AccessoriesTransformer.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
ActionlogsTransformer.php	Use Helper alias	2021-09-28 19:44:55 -07:00
AssetMaintenancesTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
AssetModelsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
AssetsTransformer.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
CategoriesTransformer.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
CompaniesTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ComponentsAssetsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ComponentsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ConsumablesTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CustomFieldsetsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CustomFieldsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DatatablesTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DepartmentsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DepreciationReportTransformer.php	Use Helper alias	2021-09-28 19:44:55 -07:00
DepreciationsTransformer.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
GroupsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ImportsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LicenseSeatsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LicensesTransformer.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
LocationsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LoginAttemptsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ManufacturersTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
PredefinedKitsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SelectlistTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
StatuslabelsTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SuppliersTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
UsersTransformer.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00