chore: Fix merge conflicts with master

This commit is contained in:
olivermrbl
2023-03-12 12:53:07 +01:00
29 changed files with 471 additions and 56 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@medusajs/medusa",
"version": "1.7.11",
"version": "1.7.12",
"description": "E-commerce for JAMstack",
"main": "dist/index.js",
"bin": "./cli.js",