Skip to content
Snippets Groups Projects
Commit 0db20aec authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'main' into 'renovate/quasar-2.x'

# Conflicts:
#   frontend/package.json
parents 36c62a96 482946ed
No related branches found
No related tags found
1 merge request!9fix(deps): update dependency quasar to v2.3.4
...@@ -95,7 +95,7 @@ dependencies { ...@@ -95,7 +95,7 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.6' testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.6'
testImplementation 'org.junit.platform:junit-platform-commons:1.8.1' testImplementation 'org.junit.platform:junit-platform-commons:1.8.2'
} }
test { test {
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
"test": "echo \"No test specified\" && exit 0" "test": "echo \"No test specified\" && exit 0"
}, },
"dependencies": { "dependencies": {
"@quasar/extras": "1.12.1", "@quasar/extras": "1.12.2",
"axios": "0.24.0", "axios": "0.24.0",
"core-js": "3.19.1",
"quasar": "2.3.4", "quasar": "2.3.4",
"core-js": "3.19.3",
"tsparticles": "1.37.5" "tsparticles": "1.37.5"
}, },
"devDependencies": { "devDependencies": {
......
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment