Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/gallery-editor/mu…
Browse files Browse the repository at this point in the history
…lti-cf87d80143
  • Loading branch information
randywoods authored Sep 13, 2024
2 parents 9909ef8 + 7b7a26f commit 510646c
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 122 deletions.
145 changes: 50 additions & 95 deletions CSETWebNg/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions CSETWebNg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"angular2-hotkeys": "^13.1.0",
"ansi-styles": "^6.1.1",
"array.prototype.fill": "^1.0.2",
"bootstrap": "^4.6.0",
"bootstrap": "^5.0.0",
"chart.js": "^4.4.3",
"core-js": "^3.9.0",
"core-js": "^3.38.1",
"datalist-polyfill": "^1.24.4",
"document-register-element": "^1.14.10",
"electron-log": "^4.4.1",
Expand Down Expand Up @@ -134,7 +134,7 @@
"protractor": "^7.0.0",
"rxjs-tslint": "^0.1.6",
"style-loader": "^3.3.2",
"ts-node": "^9.1.1",
"ts-node": "^10.9.2",
"typescript": "^4.8.2",
"webpack": "^5.63.0",
"webpack-dev-server": "^4.13.1"
Expand Down
70 changes: 46 additions & 24 deletions gallery-editor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 510646c

Please sign in to comment.