fix: Merge conflicts with master

2023-02-22 17:38:49 +01:00
parent 935870e010 8e5ebc9a1d
commit e1b92e9b04
272 changed files with 91077 additions and 3303 deletions
--- a/packages/medusa/package.json
+++ b/packages/medusa/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@medusajs/medusa",
-  "version": "1.7.7",
+  "version": "1.7.8",
  "description": "E-commerce for JAMstack",
  "main": "dist/index.js",
  "bin": "./cli.js",