Merge remote-tracking branch 'origin_kuma/master'

Browse Source

# Conflicts:
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	src/components/MonitorList.vue
#	src/components/PingChart.vue
#	src/icon.js
#	src/pages/DashboardHome.vue
#	src/pages/StatusPage.vue
#	src/router.js
#	src/util.js

...

This commit is contained in:

Karel Krýda

2022-04-30 13:40:34 +02:00

parent b49e5d5c39 26230a3d3a

commit ed84e56a85

196 changed files with 17960 additions and 6036 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

573

server/server.js

File diff suppressed because it is too large Load Diff