Merge branch 'master' into develop

# Conflicts: # yarn.lock
nrkno · Oct 12, 2023 · d14ac3e · d14ac3e
2 parents 6ad02ed + 125201d
commit d14ac3e
Show file tree

Hide file tree

Showing 2 changed files with 460 additions and 432 deletions.
diff --git a/apps/package-manager/packages/generic/package.json b/apps/package-manager/packages/generic/package.json
@@ -21,7 +21,7 @@
         "data-store": "^4.0.3",
         "deep-extend": "^0.6.0",
         "fast-clone": "^1.5.13",
-        "nanoid": "^3.3.4",
+        "nanoid": "^4.0.2",
         "underscore": "^1.12.0"
     },
     "devDependencies": {