Merge remote-tracking branch 'upstream/pull/3148'

This commit is contained in:
Tom Hughes 2021-03-24 15:32:13 +00:00
commit a512392e6c

View file

@ -260,7 +260,7 @@ GEM
mimemagic (~> 0.3.2)
maxminddb (0.1.22)
method_source (1.0.0)
mimemagic (0.3.5)
mimemagic (0.3.6)
mini_magick (4.11.0)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
@ -387,7 +387,7 @@ GEM
rexml (3.2.4)
rinku (2.0.6)
rotp (6.2.0)
rubocop (1.11.0)
rubocop (1.12.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
@ -553,4 +553,4 @@ DEPENDENCIES
webmock
BUNDLED WITH
2.1.4
2.2.8