2
0
mirror of https://github.com/inventree/inventree-website.git synced 2025-04-28 05:26:44 +00:00

Merge branch 'main' of https://github.com/inventree/inventree-website into matmair/issue55

This commit is contained in:
Matthias Mair 2023-01-20 00:50:48 +01:00
commit 7ca0f998dc
No known key found for this signature in database
GPG Key ID: A593429DDA23B66A
2 changed files with 6 additions and 13 deletions

View File

@ -16,7 +16,7 @@ GEM
eventmachine (1.2.7)
ffi (1.15.5)
forwardable-extended (2.6.0)
google-protobuf (3.21.12)
google-protobuf (3.21.12-x86_64-linux)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
@ -45,8 +45,8 @@ GEM
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-postcss-v2 (1.0.1)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
@ -64,8 +64,6 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
minitest (5.17.0)
nokogiri (1.14.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.14.0-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
@ -78,10 +76,8 @@ GEM
rexml (3.2.5)
rouge (4.0.1)
safe_yaml (1.0.5)
sass-embedded (1.57.1-arm64-darwin)
google-protobuf (~> 3.21)
sass-embedded (1.57.1-x86_64-linux-gnu)
google-protobuf (~> 3.21)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.5)
@ -90,7 +86,6 @@ GEM
webrick (1.7.0)
PLATFORMS
arm64-darwin-22
x86_64-linux
DEPENDENCIES
@ -104,4 +99,4 @@ DEPENDENCIES
webrick (~> 1.7)
BUNDLED WITH
2.3.11
2.3.26

2
package-lock.json generated
View File

@ -435,7 +435,6 @@
"dependencies": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
"fsevents": "~2.3.2",
"glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@ -1306,7 +1305,6 @@
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
"dev": true,
"dependencies": {
"graceful-fs": "^4.1.6",
"universalify": "^2.0.0"
},
"optionalDependencies": {