merge develop

2021-10-15 20:09:31 +02:00
parent 10c87e8d5a
commit 4fd361fddd
207 changed files with 8699 additions and 4124 deletions
@@ -63,6 +63,7 @@
    "glob": "^7.1.6",
    "ioredis": "^4.17.3",
    "ioredis-mock": "^5.6.0",
+    "iso8601-duration": "^1.3.0",
    "joi": "^17.3.0",
    "joi-objectid": "^3.0.1",
    "jsonwebtoken": "^8.5.1",
@@ -87,4 +88,4 @@
    "winston": "^3.2.1"
  },
  "gitHead": "41a5425405aea5045a26def95c0dc00cf4a5a44d"
-}
+}