Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Api/LocationsController.php

@@ -242,6 +242,7 @@ public function show($id) : JsonResponse | array
                 'locations.currency',
                 'locations.company_id',
                 'locations.notes',
+                'locations.tag_color',
             ])
             ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')