Skip to content

Commit

Permalink
Merge branch 'master' into hflatval/fdm-to-cdf-node-cache
Browse files Browse the repository at this point in the history
  • Loading branch information
haakonflatval-cognite authored Aug 25, 2023
2 parents b651736 + 8cead58 commit bcead7d
Show file tree
Hide file tree
Showing 2 changed files with 424 additions and 309 deletions.
2 changes: 1 addition & 1 deletion viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"glob": "10.3.3",
"glslify-loader": "2.0.0",
"html-webpack-plugin": "5.5.3",
"jest": "29.6.2",
"jest": "29.6.3",
"jest-canvas-mock": "2.5.2",
"jest-environment-jsdom": "29.6.2",
"jest-extended": "4.0.1",
Expand Down
Loading

0 comments on commit bcead7d

Please sign in to comment.