Merge master into hflatval/bump-version-sidebar-4.x

cognitedata · Sep 4, 2023 · 2c710e2 · 2c710e2
2 parents 65627f7 + 6f36c65
commit 2c710e2
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": "3.0.0",
     "file-loader": "6.2.0",
     "gl": "6.0.2",
-    "glob": "10.3.3",
+    "glob": "10.3.4",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.3",
     "jest": "29.6.4",

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