Skip to content

Commit

Permalink
Merge branch 'develop' into show-bank-account-details-on-invoices
Browse files Browse the repository at this point in the history
  • Loading branch information
apoorv1316 authored Sep 23, 2024
2 parents ed35c6d + 8588df4 commit d100b4f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem "rails", "~> 7.1.3"
gem "pg"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", "~> 6.4.2"
gem "puma", "~> 6.4.3"

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
# gem "importmap-rails", ">= 0.9.2"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ GEM
net-smtp (0.3.3)
net-protocol
newrelic_rpm (9.8.0)
nio4r (2.5.9)
nio4r (2.7.3)
nokogiri (1.16.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
Expand Down Expand Up @@ -411,7 +411,7 @@ GEM
psych (4.0.6)
stringio
public_suffix (5.0.4)
puma (6.4.2)
puma (6.4.3)
nio4r (~> 2.0)
pundit (2.3.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -704,7 +704,7 @@ DEPENDENCIES
parallel_tests
pg
psych (~> 4)
puma (~> 6.4.2)
puma (~> 6.4.3)
pundit (~> 2.2)
rack-cors (= 2.0.0)
rack-mini-profiler (>= 2.3.3)
Expand Down

0 comments on commit d100b4f

Please sign in to comment.