mirror of
https://github.com/pi-hole/web.git
synced 2026-01-09 06:20:56 +08:00
Merge b778a9a4cbf1646644466dc58ba09e18736fdfd5 into bf1dcfb65f9ec23eb815490770b140b62f203efc
This commit is contained in:
commit
0f952e18e6
8
package-lock.json
generated
8
package-lock.json
generated
@ -9,7 +9,7 @@
|
||||
"version": "1.0.0",
|
||||
"license": "EUPL-1.2",
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free": "6.7.2",
|
||||
"@fortawesome/fontawesome-free": "7.0.0",
|
||||
"admin-lte": "2.4.18",
|
||||
"animate.css": "4.1.1",
|
||||
"bootstrap": "3.4.1",
|
||||
@ -283,9 +283,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@fortawesome/fontawesome-free": {
|
||||
"version": "6.7.2",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
|
||||
"integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.0.tgz",
|
||||
"integrity": "sha512-X48nISrSOa89zu2VMljC4XaRf8NmgTwQBVHfS2Nu5G00ZwM31oOVrAtGxZF3b6wDYf9lJsf/Eq4cCSFKIkOWPQ==",
|
||||
"license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
"testpr": "npm run prefix && npm run prettier:fix && git diff --ws-error-highlight=all --color=always --exit-code && npm run xo:check"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free": "6.7.2",
|
||||
"@fortawesome/fontawesome-free": "7.0.0",
|
||||
"admin-lte": "2.4.18",
|
||||
"animate.css": "4.1.1",
|
||||
"bootstrap": "3.4.1",
|
||||
|
||||
10
vendor/font-awesome/css/all.min.css
vendored
10
vendor/font-awesome/css/all.min.css
vendored
File diff suppressed because one or more lines are too long
BIN
vendor/font-awesome/webfonts/fa-brands-400.ttf
vendored
BIN
vendor/font-awesome/webfonts/fa-brands-400.ttf
vendored
Binary file not shown.
BIN
vendor/font-awesome/webfonts/fa-brands-400.woff2
vendored
BIN
vendor/font-awesome/webfonts/fa-brands-400.woff2
vendored
Binary file not shown.
BIN
vendor/font-awesome/webfonts/fa-regular-400.ttf
vendored
BIN
vendor/font-awesome/webfonts/fa-regular-400.ttf
vendored
Binary file not shown.
BIN
vendor/font-awesome/webfonts/fa-regular-400.woff2
vendored
BIN
vendor/font-awesome/webfonts/fa-regular-400.woff2
vendored
Binary file not shown.
BIN
vendor/font-awesome/webfonts/fa-solid-900.ttf
vendored
BIN
vendor/font-awesome/webfonts/fa-solid-900.ttf
vendored
Binary file not shown.
BIN
vendor/font-awesome/webfonts/fa-solid-900.woff2
vendored
BIN
vendor/font-awesome/webfonts/fa-solid-900.woff2
vendored
Binary file not shown.
BIN
vendor/font-awesome/webfonts/fa-v4compatibility.ttf
vendored
BIN
vendor/font-awesome/webfonts/fa-v4compatibility.ttf
vendored
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user