merge develop

2021-10-15 20:09:31 +02:00
parent 10c87e8d5a
commit 4fd361fddd
207 changed files with 8699 additions and 4124 deletions
--- a/integration-tests/api/jest.config.js
+++ b/integration-tests/api/jest.config.js
@@ -13,4 +13,4 @@ module.exports = {
  ],
  transform: { "^.+\\.[jt]s$": `../../jest-transformer.js` },
  setupFilesAfterEnv: ["../setup.js"],
-};
+}