fix: merge develop

This commit is contained in:
Sebastian Rindom committed 2021-04-13 12:16:40 +02:00
1 parent a468c451e8
commit 2982a8e682
19 files changed
-80

No files matched your search

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-13)
=======
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-09)
>>>>>>> origin/develop
### Bug Fixes