Merge remote-tracking branch 'origin/beta-master' into 565-migrate-to…

…-mui-v6 # Conflicts: # package-lock.json
AFP-Medialab · Sep 6, 2024 · 2ae9390 · 2ae9390
2 parents 8e23203 + 0c73769
commit 2ae9390
Show file tree

Hide file tree

Showing 16 changed files with 1,141 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "@types/chrome": "^0.0.266",
     "@wavesurfer/react": "^1.0.4",
     "axios": "^1.7.3",
+    "c2pa": "^0.22.1",
     "chart.js": "^4.4.3",
     "chartjs-adapter-dayjs-4": "^1.0.4",
     "clsx": "^2.1.1",

diff --git a/public/c2paAssets/c2pa_worker_min.js b/public/c2paAssets/c2pa_worker_min.js
diff --git a/public/c2paAssets/toolkit_bg.wasm b/public/c2paAssets/toolkit_bg.wasm