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

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
2020-10-29 23:43:20 +01:00

View File

@@ -13,14 +13,14 @@
"@nuxtjs/axios": "^5.12.2", "@nuxtjs/axios": "^5.12.2",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"nuxt": "^2.14.6", "nuxt": "^2.14.6",
"sass": "^1.27.0", "sass": "^1.27.1",
"sass-loader": "^10.0.3" "sass-loader": "^10.0.4"
}, },
"devDependencies": { "devDependencies": {
"@nuxt/types": "^2.14.6", "@nuxt/types": "^2.14.6",
"@nuxt/typescript-build": "^2.0.3", "@nuxt/typescript-build": "^2.0.3",
"@nuxtjs/color-mode": "^2.0.0", "@nuxtjs/color-mode": "^2.0.0",
"@nuxtjs/tailwindcss": "^3.1.0", "tailwindcss-dark-mode": "^1.1.7",
"tailwindcss-dark-mode": "^1.1.7" "@nuxtjs/tailwindcss": "^3.2.0"
} }
} }