fix: Merge conflicts with master

This commit is contained in:
olivermrbl committed 2023-02-22 17:38:49 +01:00
commit e1b92e9b04
272 files changed
+91077 -3303

No files matched your search

+1 -1
View File
@@ -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",