Merge branch 'master' into dependabot/npm_and_yarn/types/node-14.0.23

Author: pashidlos

package-lock.json

@@ -55,7 +55,7 @@
     "@prisma/cli": "^2.2.2",
     "@types/bcryptjs": "^2.4.2",
     "@types/express": "^4.17.7",
-    "@types/jest": "25.1.4",
+    "@types/jest": "26.0.5",
     "@types/node": "^14.0.23",
     "@types/passport-jwt": "^3.0.3",
     "@types/passport-local": "^1.0.33",