merge and conflicts

This commit is contained in:
vx3r 2023-01-31 16:47:13 +01:00
parent ad85ef7442
commit 7c96bbef71
1 changed files with 1 additions and 1 deletions

2
ui/package-lock.json generated
View File

@ -10,7 +10,7 @@
"dependencies": {
"axios": "^0.21.4",
"is-cidr": "^4.0.2",
"moment": "^2.29.1",
"moment": "^2.29.4",
"vue": "^2.6.14",
"vue-axios": "^3.4.0",
"vue-moment": "^4.1.0",