fix: Merge conflicts with master

This commit is contained in:
olivermrbl committed 2023-01-18 10:17:39 +01:00
commit ab580066ae
135 files changed
+7501 -1981

No files matched your search

+6
View File
@@ -0,0 +1,6 @@
---
"@medusajs/medusa-js": patch
"medusa-react": patch
---
hotfix: Fixes bundling error making JS client unable to run in Node enviornments. Also fixes wrong payload type of admin file uploads.