fix: resolve merge conflict

2025-09-30 19:59:22 +08:00 · 2022-08-13 13:26:05 +07:00
parent 34ab6142db af94424283
commit 6bb79597e8
21 changed files with 439 additions and 18 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "uptime-kuma",
-    "version": "1.17.1",
+    "version": "1.18.0-beta.0",
    "license": "MIT",
    "repository": {
        "type": "git",
@@ -96,6 +96,7 @@
        "mqtt": "^4.2.8",
        "mssql": "^8.1.0",
        "node-cloudflared-tunnel": "~1.0.9",
+        "node-radius-client": "^1.0.0",
        "nodemailer": "~6.6.5",
        "notp": "~2.0.3",
        "password-hash": "~1.2.2",