fix: Merge conflicts with master

This commit is contained in:
olivermrbl committed 2023-02-28 11:24:46 +01:00
commit 7738525401
14 files changed
+1602 -89

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@medusajs/medusa",
"version": "1.7.8",
"version": "1.7.9",
"description": "E-commerce for JAMstack",
"main": "dist/index.js",
"bin": "./cli.js",