chore: Fix merge conflicts with master
This commit is contained in:
commit
6d928628a9
29 files changed
+471
-56
No files matched your search
@@ -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",
|
||||
|
||||
Reference in new issue
Block a user