Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2765'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Aug 10, 2020
2 parents 49ab6c1 + 5bfca4b commit e1da786
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.4.7)
msgpack (~> 1.0)
bootstrap (4.5.0)
bootstrap (4.5.2)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
Expand All @@ -133,7 +133,7 @@ GEM
coderay (1.1.3)
composite_primary_keys (12.0.2)
activerecord (~> 6.0.0)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.7)
config (2.2.1)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
Expand Down

0 comments on commit e1da786

Please sign in to comment.