Merge remote-tracking branch 'origin/main' into v2.2

This commit is contained in:
Michael Kaufmann
2024-08-14 12:39:03 +02:00
2 changed files with 6 additions and 6 deletions

10
package-lock.json generated
View File

@@ -9,7 +9,7 @@
"@fortawesome/fontawesome-free": "^6.4.2", "@fortawesome/fontawesome-free": "^6.4.2",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue": "^4.0.0",
"axios": "^1.6.0", "axios": "^1.7.4",
"bootstrap": "^5.3.2", "bootstrap": "^5.3.2",
"chart.js": "^4.4.0", "chart.js": "^4.4.0",
"jquery": "^3.6.1", "jquery": "^3.6.1",
@@ -580,12 +580,12 @@
"dev": true "dev": true
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.6.0", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
"integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.0", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"proxy-from-env": "^1.1.0" "proxy-from-env": "^1.1.0"
} }

View File

@@ -9,7 +9,7 @@
"@fortawesome/fontawesome-free": "^6.4.2", "@fortawesome/fontawesome-free": "^6.4.2",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue": "^4.0.0",
"axios": "^1.6.0", "axios": "^1.7.4",
"bootstrap": "^5.3.2", "bootstrap": "^5.3.2",
"chart.js": "^4.4.0", "chart.js": "^4.4.0",
"jquery": "^3.6.1", "jquery": "^3.6.1",