fix: merge develop

packages/medusa/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.18](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.17...@medusajs/medusa@1.1.18) (2021-04-13)
+## [1.1.18](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.17...@medusajs/medusa@1.1.18) (2021-04-09)
 
 
 ### Bug Fixes

packages/medusa/package.json

@@ -67,7 +67,7 @@
     "joi": "^17.3.0",
     "joi-objectid": "^3.0.1",
     "jsonwebtoken": "^8.5.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
     "medusa-test-utils": "^1.1.8",
     "morgan": "^1.9.1",
     "multer": "^1.4.2",