Merge branch 'master' into uptime-badges

# Conflicts:
#	server/util-server.js
This commit is contained in:
Louis Lam
2022-05-07 13:26:47 +08:00
8 changed files with 47 additions and 46 deletions

View File

@@ -64,7 +64,7 @@
"@fortawesome/free-regular-svg-icons": "~5.15.4",
"@fortawesome/free-solid-svg-icons": "~5.15.4",
"@fortawesome/vue-fontawesome": "~3.0.0-5",
"@louislam/sqlite3": "~15.0.3",
"@louislam/sqlite3": "~15.0.6",
"@popperjs/core": "~2.10.2",
"args-parser": "~1.3.0",
"axios": "~0.26.1",