Merge remote-tracking branch 'origin/master' into develop

packages/medusa/CHANGELOG.md

@@ -3,6 +3,17 @@
 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-09)
+
+
+### Bug Fixes
+
+* **medusa:** Move discount usage from rule to discount ([#221](https://github.com/medusajs/medusa/issues/221)) ([7771471](https://github.com/medusajs/medusa/commit/77714716121c5629cedf3b9051eefb66fe38be32))
+
+
+
+
+
 ## [1.1.17](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.17) (2021-03-30)
 
 

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "repository": {
@@ -67,8 +67,8 @@
     "joi": "^17.3.0",
     "joi-objectid": "^3.0.1",
     "jsonwebtoken": "^8.5.1",
-    "medusa-core-utils": "^1.1.4",
-    "medusa-test-utils": "^1.1.7",
+    "medusa-core-utils": "^1.1.5",
+    "medusa-test-utils": "^1.1.8",
     "morgan": "^1.9.1",
     "multer": "^1.4.2",
     "passport": "^0.4.0",