arthur/website-old
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/website-old.git synced 2026-01-30 19:57:54 +01:00
Code Issues 31 Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
Arthur Danjou
2020-11-20 16:59:36 +01:00
parent bb18daede2 7774a850d7
commit 19db34f3dd
2 changed files with 231 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

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

526
yarn.lock
View File

File diff suppressed because it is too large Load Diff