Skip to content

Commit

Permalink
Merge branch 'beta-master' into 466-imatag-c2pa-tool
Browse files Browse the repository at this point in the history
  • Loading branch information
robfrks committed Sep 6, 2024
2 parents 6396535 + 0496729 commit a2d034d
Show file tree
Hide file tree
Showing 30 changed files with 3,043 additions and 351 deletions.
124 changes: 68 additions & 56 deletions 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@reduxjs/toolkit": "^1.9.7",
"@types/chrome": "^0.0.266",
"@wavesurfer/react": "^1.0.4",
"axios": "^1.5.1",
"axios": "^1.7.3",
"c2pa": "^0.22.1",
"chart.js": "^4.4.3",
"chartjs-adapter-dayjs-4": "^1.0.4",
Expand Down Expand Up @@ -80,7 +80,7 @@
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.22.20",
"@babel/preset-react": "^7.22.15",
"@playwright/experimental-ct-react": "^1.43.1",
"@playwright/experimental-ct-react": "^1.45.3",
"@playwright/test": "^1.43.1",
"@svgr/webpack": "^8.1.0",
"@types/node": "^18.18.4",
Expand All @@ -100,7 +100,7 @@
"prettier": "3.0.3",
"svg-url-loader": "^8.0.0",
"url-loader": "^4.1.1",
"webpack": "^5.88.2",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/locales/en/components/NavItems/tools/Assistant.json

Large diffs are not rendered by default.

Loading

0 comments on commit a2d034d

Please sign in to comment.