chore: merge and resolve

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.8.0",
+  "version": "2.10.1",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",
@@ -43,7 +43,7 @@
     "htmlparser2": "^8.0.1",
     "lru-cache": "^10.0.3",
     "node-tone": "^1.0.1",
-    "nodemailer": "^6.9.2",
+    "nodemailer": "^6.9.13",
     "openid-client": "^5.6.1",
     "p-throttle": "^4.1.1",
     "passport": "^0.6.0",