Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into add-bundle-lock
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/Gemfile.lock
  • Loading branch information
Shazwazza committed Oct 21, 2024
2 parents c917139 + 91bdbcb commit ffb33a9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -201,22 +201,22 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.8.0)
mini_portile2 (2.8.6)
minima (2.5.0)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.16.3)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
racc (1.6.1)
racc (1.7.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand Down

0 comments on commit ffb33a9

Please sign in to comment.