fix: merge develop

This commit is contained in:
Sebastian Rindom
2021-04-13 12:13:32 +02:00
37 changed files with 121 additions and 17 deletions
@@ -3,7 +3,11 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-economic