Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ujh/fountainpencompanion
Browse files Browse the repository at this point in the history
  • Loading branch information
ujh committed Jan 6, 2025
2 parents d5bc063 + 9517d8c commit 6aabc70
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
Expand Down Expand Up @@ -203,7 +203,7 @@ GEM
mutex_m
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
google-apis-youtube_v3 (0.52.0)
google-apis-youtube_v3 (0.53.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-env (2.2.1)
faraday (>= 1.0, < 3.a)
Expand All @@ -220,7 +220,7 @@ GEM
google-protobuf (4.29.2-x86_64-linux)
bigdecimal
rake (>= 13)
googleauth (1.12.0)
googleauth (1.12.2)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
Expand Down Expand Up @@ -271,7 +271,7 @@ GEM
jsonapi-renderer (~> 0.2.0)
jsonapi-serializer (2.2.0)
activesupport (>= 4.2)
jwt (2.9.3)
jwt (2.10.1)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"react-table-6": "^6.11.0",
"recharts": "2.12.5",
"regenerator-runtime": "^0.14.1",
"sass": "^1.83.0",
"sass": "^1.83.1",
"sass-loader": "^16.0.4",
"select2": "4.0.13",
"webpack": "^5.97.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7486,10 +7486,10 @@ sass-loader@^16.0.4:
dependencies:
neo-async "^2.6.2"

sass@^1.83.0:
version "1.83.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.0.tgz#e36842c0b88a94ed336fd16249b878a0541d536f"
integrity sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==
sass@^1.83.1:
version "1.83.1"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
dependencies:
chokidar "^4.0.0"
immutable "^5.0.2"
Expand Down

0 comments on commit 6aabc70

Please sign in to comment.