Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2881'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Oct 13, 2020
2 parents d6c832c + 427e129 commit 9b19a45
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Expand Up @@ -383,13 +383,13 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.8.1)
regexp_parser (1.8.2)
request_store (1.5.0)
rack (>= 1.4)
rexml (3.2.4)
rinku (2.0.6)
rotp (6.2.0)
rubocop (0.93.0)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
Expand All @@ -398,7 +398,7 @@ GEM
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.7.1)
rubocop-ast (0.8.0)
parser (>= 2.7.1.5)
rubocop-minitest (0.10.1)
rubocop (>= 0.87)
Expand Down

0 comments on commit 9b19a45

Please sign in to comment.