Merge refs/heads/master into savokr/react-styling-components

cognitedata · Jul 13, 2023 · 062d6b0 · 062d6b0
2 parents 69b0165 + 0feb1c1
commit 062d6b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/viewer/package.json b/viewer/package.json
@@ -110,7 +110,7 @@
     "eslint-plugin-unused-imports": "2.0.0",
     "file-loader": "6.2.0",
     "gl": "6.0.2",
-    "glob": "10.3.2",
+    "glob": "10.3.3",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.3",
     "jest": "29.6.1",

diff --git a/viewer/yarn.lock b/viewer/yarn.lock