Skip to content

Commit

Permalink
Merge branch 'develop' into merge-dev-to-ten
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
bdukes committed Dec 6, 2024
2 parents a6520f3 + 984824a commit 0d3bc88
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dnn.AdminExperience/ClientSide/Pages.Web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"react-hot-loader": "4.13.1",
"react-test-renderer": "^17.0.2",
"react-widgets": "5.8.4",
"string.prototype.startswith": "1.0.0",
"string.prototype.startswith": "1.0.1",
"style-loader": "^0.23.1",
"throttle-debounce": "^5.0.0",
"uglifyjs-webpack-plugin": "^2.2.0",
Expand Down
15 changes: 8 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18024,7 +18024,7 @@ __metadata:
react-hot-loader: "npm:4.13.1"
react-test-renderer: "npm:^17.0.2"
react-widgets: "npm:5.8.4"
string.prototype.startswith: "npm:1.0.0"
string.prototype.startswith: "npm:1.0.1"
style-loader: "npm:^0.23.1"
throttle-debounce: "npm:^5.0.0"
uglifyjs-webpack-plugin: "npm:^2.2.0"
Expand Down Expand Up @@ -22459,13 +22459,14 @@ __metadata:
languageName: node
linkType: hard

"string.prototype.startswith@npm:1.0.0":
version: 1.0.0
resolution: "string.prototype.startswith@npm:1.0.0"
"string.prototype.startswith@npm:1.0.1":
version: 1.0.1
resolution: "string.prototype.startswith@npm:1.0.1"
dependencies:
define-properties: "npm:^1.1.3"
es-abstract: "npm:^1.17.5"
checksum: 10/35cc05346db6dcc7dd6beba4f37eeac388bbb70a49d3642d4f616a406791709a590dce315418cc12e78d417142c5c61f8f33caf36e041602f3660f6d7bdcfdfb
call-bind: "npm:^1.0.7"
define-properties: "npm:^1.2.1"
es-abstract: "npm:^1.23.3"
checksum: 10/654a2dfb57eb29605e50736f5f4eadb391780472315bdf76524bb600d80d131be77fb31ee82d8661416f692443a102f0c4c98347e695f746e101c1c0b9af3818
languageName: node
linkType: hard

Expand Down

0 comments on commit 0d3bc88

Please sign in to comment.