Skip to content

Commit 64723a9

Browse files
committed
Merge branch 'develop' into feat/app-status-modal
2 parents 92dfeaf + 023d109 commit 64723a9

34 files changed

+405
-117
lines changed

package-lock.json

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.11.0-beta-4",
3+
"version": "1.12.0-pre-0",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -121,6 +121,7 @@
121121
"jsonpath-plus": "^10.3.0",
122122
"marked": "^13.0.3",
123123
"nanoid": "^3.3.8",
124+
"qrcode.react": "^4.2.0",
124125
"react-canvas-confetti": "^2.0.7",
125126
"react-dates": "^21.8.0",
126127
"react-diff-viewer-continued": "^3.4.0",

src/Assets/Icon/ic-cpu.svg

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Assets/Icon/ic-memory.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/Assets/IconV2/ic-bg-cluster.svg

Lines changed: 6 additions & 0 deletions
Loading

src/Assets/IconV2/ic-cpu.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-file-key.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-help-filled.svg

Lines changed: 4 additions & 0 deletions
Loading

src/Assets/IconV2/ic-memory.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)