chore: Merge master to develop and manage conflict (#3570)

This commit is contained in:
Adrien de Peretti
2023-03-29 10:11:32 +02:00
committed by GitHub
parent 0695ff642b
commit 7f120e576b
25 changed files with 1033 additions and 383 deletions
+1 -1
View File
@@ -2407,4 +2407,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Bug Fixes
- updates license ([db519fb](https://github.com/medusajs/medusa/commit/db519fbaa6f8ad02c19cbecba5d4f28ba1ee81aa))
- updates license ([db519fb](https://github.com/medusajs/medusa/commit/db519fbaa6f8ad02c19cbecba5d4f28ba1ee81aa))