Merge branch '1.23.X' into 1.23.13-to-2.0.0

Browse Source

# Conflicts:
#	.github/workflows/auto-test.yml
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/monitor-types/real-browser-monitor-type.js
#	server/util-server.js
#	test/cypress/unit/i18n.spec.js

...

This commit is contained in:

Louis Lam

2024-04-25 15:42:53 +08:00

parent bab427f715 2778929f74

commit 63a380326d

13 changed files with 152 additions and 66 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

test/cypress/unit/i18n.spec.js Normal file