Merge branch 'main' into profiles

# Conflicts: # package-lock.json
projectsveltos · Feb 4, 2025 · 206293d · 206293d
2 parents d173f48 + f591de1
commit 206293d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -65,4 +65,4 @@ manifests: ## Generate manifests
 	MANIFEST_IMG=$(CONTROLLER_IMG) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
 
 set-manifest-image:
-	sed -i'' -e 's@image: .*@image: '"docker.io/${MANIFEST_IMG}:$(MANIFEST_TAG)"'@' ./manifest/manifest.yaml >> ./manifest/manifest.yaml-e
+	sed -i'' -e 's@image: .*@image: '"docker.io/${MANIFEST_IMG}:$(MANIFEST_TAG)"'@' ./manifest/manifest.yaml >> ./manifest/manifest.yaml-e
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "globals": "^15.0.0",
     "postcss": "^8.4.31",
     "prettier": "3.2.5",
-    "tailwindcss": "^3.3.3",
+    "tailwindcss": "^3.3.2",
     "typescript": "^4.9.5",
     "vite": "^3.1.0",
     "vite-plugin-eslint": "^1.8.1",