gustavosantos/MIKROTIK-RMM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from 2GT-Media-Group-LLC/dependabot/npm_and_yarn/frontend/tailwind-merge-3.5.0

Browse Source 
Bump tailwind-merge from 2.6.1 to 3.5.0 in /frontend
This commit is contained in:
2GT-Rich
2026-04-19 09:46:52 -07:00
committed by GitHub
parent 9511927a05 e4c4f0a440
commit 6cb2e6844c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/package-lock.json
Generated
+4 -4
View File
@@ -23,7 +23,7 @@
"react-router-dom": "^6.21.1", "react-router-dom": "^6.21.1",
"recharts": "^2.10.3", "recharts": "^2.10.3",
"socket.io-client": "^4.7.3", "socket.io-client": "^4.7.3",
"tailwind-merge": "^2.2.1", "tailwind-merge": "^3.5.0",
"zustand": "^4.4.7" "zustand": "^4.4.7"
}, },
"devDependencies": { "devDependencies": {
@@ -6140,9 +6140,9 @@
} }
}, },
"node_modules/tailwind-merge": { "node_modules/tailwind-merge": {
"version": "2.6.1", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
"integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==", "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
"license": "MIT", "license": "MIT",
"funding": { "funding": {
"type": "github", "type": "github",
frontend/package.json
+1 -1
View File
@@ -25,7 +25,7 @@
"react-router-dom": "^6.21.1", "react-router-dom": "^6.21.1",
"recharts": "^2.10.3", "recharts": "^2.10.3",
"socket.io-client": "^4.7.3", "socket.io-client": "^4.7.3",
"tailwind-merge": "^2.2.1", "tailwind-merge": "^3.5.0",
"zustand": "^4.4.7" "zustand": "^4.4.7"
}, },
"devDependencies": { "devDependencies": {