Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	yarn.lock
This commit is contained in:
2020-11-20 16:59:36 +01:00
2 changed files with 231 additions and 301 deletions

View File

@@ -11,10 +11,10 @@
"dependencies": {
"@nuxt/typescript-runtime": "^2.0.0",
"@nuxtjs/axios": "^5.12.2",
"core-js": "^3.6.5",
"core-js": "^3.7.0",
"nuxt": "^2.14.6",
"sass": "^1.28.0",
"sass-loader": "^10.0.4"
"sass": "^1.29.0",
"sass-loader": "^10.1.0"
},
"devDependencies": {
"@nuxt/types": "^2.14.6",

526
yarn.lock

File diff suppressed because it is too large Load Diff