Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2833'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Sep 16, 2020
2 parents 17096f9 + b105424 commit 5c3a377
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -390,13 +390,13 @@ GEM
rexml (3.2.4)
rinku (2.0.6)
rotp (6.1.0)
rubocop (0.90.0)
rubocop (0.91.0)
parallel (~> 1.10)
parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.3.0, < 1.0)
rubocop-ast (>= 0.4.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.4.0)
Expand Down

0 comments on commit 5c3a377

Please sign in to comment.