samuel-p/sp-magic.de
samuel-p/sp-magic.de
1
0
Fork 0
Code Issues Pull requests 8 Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details

Browse source 
# Conflicts:
#	package.json
This commit is contained in:
Samuel Philipp 2020-08-09 16:25:45 +02:00
commit 4284b6dea1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -12,7 +12,7 @@
"url": "https://git.sp-codes.de/samuel-p/sp-magic.de" "url": "https://git.sp-codes.de/samuel-p/sp-magic.de"
}, },
"optionalDependencies": { "optionalDependencies": {
"browser-sync": "^2.26.7" "browser-sync": "^2.26.12"
}, },
"devDependencies": { "devDependencies": {
"gulp": "4.0.2", "gulp": "4.0.2",
@ -27,11 +27,11 @@
"gulp-sass": "4.1.0", "gulp-sass": "4.1.0",
"gulp-postcss": "8.0.0", "gulp-postcss": "8.0.0",
"cssnano": "4.1.10", "cssnano": "4.1.10",
"autoprefixer": "9.8.4", "autoprefixer": "9.8.6",
"node-sass-tilde-importer": "^1.0.2" "node-sass-tilde-importer": "^1.0.2"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.13.1", "@fortawesome/fontawesome-free": "^5.14.0",
"bootstrap": "^4.5.2", "bootstrap": "^4.5.2",
"jquery": "^3.5.1" "jquery": "^3.5.1"
} }