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
--- a/integration-tests/plugins/tests/inventory/service.js
+++ b/integration-tests/plugins/tests/inventory/service.js
@@ -3,7 +3,7 @@ const path = require("path")
 const { bootstrapApp } = require("../../../helpers/bootstrap-app")
 const { initDb, useDb } = require("../../../helpers/use-db")

-jest.setTimeout(30000)
+jest.setTimeout(50000)

 describe("Inventory Module", () => {
  let appContainer