Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # package.json
This commit is contained in:
commit
4284b6dea1
1 changed files with 3 additions and 3 deletions
|
@ -12,7 +12,7 @@
|
|||
"url": "https://git.sp-codes.de/samuel-p/sp-magic.de"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"browser-sync": "^2.26.7"
|
||||
"browser-sync": "^2.26.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"gulp": "4.0.2",
|
||||
|
@ -27,11 +27,11 @@
|
|||
"gulp-sass": "4.1.0",
|
||||
"gulp-postcss": "8.0.0",
|
||||
"cssnano": "4.1.10",
|
||||
"autoprefixer": "9.8.4",
|
||||
"autoprefixer": "9.8.6",
|
||||
"node-sass-tilde-importer": "^1.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free": "^5.13.1",
|
||||
"@fortawesome/fontawesome-free": "^5.14.0",
|
||||
"bootstrap": "^4.5.2",
|
||||
"jquery": "^3.5.1"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue