Merge branch 'master' into default-notification

# Conflicts: # server/notification.js # src/components/NotificationDialog.vue
2025-09-20 02:35:48 +08:00 · 2021-09-07 23:40:42 +08:00
parent 4faa409027 5ca0dd628d
commit 0aeaf87f5b
40 changed files with 1082 additions and 785 deletions
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -118,5 +118,6 @@ export default {
    Create: "Create",
    "Clear Data": "Clear Data",
    Events: "Events",
-    Heartbeats: "Heartbeats"
+    Heartbeats: "Heartbeats",
+    "Auto Get": "Auto Get"
 }