mirror of
https://github.com/louislam/uptime-kuma.git
synced 2025-08-21 23:43:08 +08:00
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
# Conflicts: # .github/workflows/auto-test.yml # extra/reset-password.js # package-lock.json # package.json # server/routers/status-page-router.js # server/server.js # server/socket-handlers/general-socket-handler.js # server/uptime-kuma-server.js # src/components/ActionInput.vue # src/util.js # src/util.ts
This commit is contained in:
@@ -135,7 +135,7 @@
|
||||
<script lang="ts">
|
||||
import { Modal } from "bootstrap";
|
||||
import CopyableInput from "./CopyableInput.vue";
|
||||
import { default as serverConfig } from "../../server/config.js";
|
||||
import { badgeConstants } from "../util.ts";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
@@ -230,7 +230,7 @@ export default {
|
||||
"labelColor",
|
||||
],
|
||||
},
|
||||
badgeConstants: serverConfig.badgeConstants,
|
||||
badgeConstants,
|
||||
};
|
||||
},
|
||||
|
||||
|
Reference in New Issue
Block a user