Skip to content

Commit

Permalink
Merge 8e3a2b4 into 0667ae0
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] committed Jun 26, 2020
2 parents 0667ae0 + 8e3a2b4 commit 17f9190
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gem "image_optim_rails"
gem "actionpack-page_caching", ">= 1.2.0"
gem "active_record_union"
gem "activerecord-import"
gem "bootstrap", "~> 4.3.1"
gem "bootstrap", "~> 4.5.0"
gem "cancancan"
gem "composite_primary_keys", "~> 12.0.0"
gem "config"
Expand Down
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.6)
msgpack (~> 1.0)
bootstrap (4.3.1)
bootstrap (4.5.0)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
Expand Down Expand Up @@ -482,7 +482,7 @@ DEPENDENCIES
bigdecimal (~> 1.1.0)
binding_of_caller
bootsnap (>= 1.4.2)
bootstrap (~> 4.3.1)
bootstrap (~> 4.5.0)
browser
bzip2-ffi
cancancan
Expand Down

0 comments on commit 17f9190

Please sign in to comment.