Skip to content

Commit 150d59a

Browse files
authored
Merge branch 'dev' into mfancher/package-bumps
2 parents 99161f4 + d376ef9 commit 150d59a

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

Diff for: Tombolo/client-reactjs/package-lock.json

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Tombolo/client-reactjs/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
"jwt-decode": "^2.2.0",
2929
"moment": "^2.30.1",
3030
"papaparse": "^5.2.0",
31+
3132
"postcss": ">=8.4.31",
33+
3234
"re-resizable": "^6.9.1",
3335
"react": "^18.2.0",
3436
"react-dom": "^18.2.0",

Diff for: Tombolo/server/package-lock.json

+22-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Tombolo/server/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
"tmp": "^0.1.0",
5454
"tough-cookie": ">=4.1.3",
5555
"uuid": "^3.4.0",
56-
"winston": "^3.7.2"
56+
"winston": "^3.7.2",
57+
"xmldom": "^0.6.0"
5758
},
5859
"devDependencies": {
5960
"jest": "^29.5.0",

0 commit comments

Comments
 (0)