merge and conflicts

This commit is contained in:
vx3r 2023-01-31 17:03:41 +01:00
parent 7c96bbef71
commit 4fd1e34f5f
2 changed files with 596 additions and 1019 deletions

1613
ui/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli-plugin-router": "^4.5.15",
"@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-service": "^5.0.8",
"sass": "^1.48.0",
"sass-loader": "^10.2.1",