Merge remote-tracking branch 'upstream/pull/2988' into master

This commit is contained in:
Tom Hughes 2020-12-01 08:18:59 +00:00
commit c418523ed8

View file

@ -333,7 +333,7 @@ GEM
progress (3.5.2)
psych (3.2.0)
public_suffix (4.0.6)
puma (5.0.4)
puma (5.1.0)
nio4r (~> 2.0)
quad_tile (1.0.1)
r2 (0.2.7)