Skip to content

Commit

Permalink
Merge branch 'master' into carbon
Browse files Browse the repository at this point in the history
  • Loading branch information
mattcone committed Jan 3, 2024
2 parents ab2163e + 3c54bd1 commit 3edaa77
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEM
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
async (2.6.5)
async (2.7.0)
console (~> 1.10)
fiber-annotation
io-event (~> 1.1)
Expand Down Expand Up @@ -38,7 +38,7 @@ GEM
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-event (1.3.3)
io-event (1.4.0)
jekyll (4.2.2)
addressable (~> 2.4)
colorator (~> 1.0)
Expand Down Expand Up @@ -73,12 +73,12 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.5)
nokogiri (1.15.5)
nokogiri (1.16.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pdf-reader (2.11.0)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Matt Cone
Copyright (c) 2024 Matt Cone

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit 3edaa77

Please sign in to comment.