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

# Conflicts:
#	package-lock.json
This commit is contained in:
Samuel Philipp 2020-07-05 12:44:42 +02:00
commit 14fc389061

View file

@ -31,7 +31,7 @@
"node-sass-tilde-importer": "^1.0.2" "node-sass-tilde-importer": "^1.0.2"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.11.2", "@fortawesome/fontawesome-free": "^5.13.1",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"jquery": "^3.4.1" "jquery": "^3.4.1"
} }