Merge branch 'master' into dep-fix

Author: 31453

package.json

@@ -24,8 +24,8 @@
     "form-data": "4.0.0",
     "https-proxy-agent": "5.0.0",
     "node-fetch": "2.6.7",
-    "nodemailer": "6.9.9",
-    "web-push": "3.5.0",
+    "nodemailer": "^6.9.9",
+    "web-push": "^3.5.0",
     "winston": "3.3.3"
   },
   "devDependencies": {