Merge remote-tracking branch 'origin/renovate/jquery-3.x'

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Samuel Philipp 2020-07-05 13:37:42 +02:00
commit 24e3604809

View file

@ -33,6 +33,6 @@
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.13.1", "@fortawesome/fontawesome-free": "^5.13.1",
"bootstrap": "^4.5.0", "bootstrap": "^4.5.0",
"jquery": "^3.4.1" "jquery": "^3.5.1"
} }
} }