Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X

# Conflicts:
#	package.json
#	server/model/monitor.js
This commit is contained in:
Louis Lam
2023-11-20 14:49:45 +08:00
3 changed files with 7 additions and 5 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "uptime-kuma",
"version": "1.23.5",
"version": "1.23.6",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "uptime-kuma",
"version": "1.23.5",
"version": "1.23.6",
"license": "MIT",
"dependencies": {
"@grpc/grpc-js": "~1.7.3",