chore: Merge conflicts with master

2023-03-14 11:43:31 +01:00
parent d278ac25c8 9ceddf45a9
commit 24604f1b71
80 changed files with 1946 additions and 1671 deletions
@@ -1,6 +1,6 @@
 {
  "name": "@medusajs/inventory",
-  "version": "1.0.9",
+  "version": "1.0.10",
  "description": "Inventory Module for Medusa",
  "main": "dist/index.js",
  "repository": {
@@ -35,7 +35,7 @@
    "test:unit": "jest --passWithNoTests"
  },
  "peerDependencies": {
-    "@medusajs/medusa": "1.7.12",
+    "@medusajs/medusa": "1.7.13",
    "typeorm": "^0.3.11"
  }
 }