Skip to content

Commit

Permalink
Merge branch 'main' into c-c++
Browse files Browse the repository at this point in the history
  • Loading branch information
Hayley Denbraver authored Nov 10, 2023
2 parents 5a87d71 + 007b8e4 commit 9e54b1b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source "https://rubygems.org"
gem "github-pages", "~> 228", group: :jekyll_plugins
# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.17"
gem "jekyll-feed", "~> 0.15"
end

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
18 changes: 14 additions & 4 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.8)
activesupport (7.1.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.1.1)
base64 (0.2.0)
bigdecimal (3.1.4)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
dnsruby (1.70.0)
simpleidn (~> 0.2.1)
drb (2.2.0)
ruby2_keywords
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
Expand Down Expand Up @@ -212,6 +221,7 @@ GEM
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.20.0)
mutex_m (0.2.0)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
Expand All @@ -220,7 +230,7 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
racc (1.7.1)
racc (1.7.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -257,7 +267,7 @@ PLATFORMS
DEPENDENCIES
github-pages (~> 228)
http_parser.rb (~> 0.8.0)
jekyll-feed (~> 0.12)
jekyll-feed (~> 0.15)
tzinfo (>= 1, < 3)
tzinfo-data
wdm (~> 0.1.1)
Expand Down

0 comments on commit 9e54b1b

Please sign in to comment.