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

This commit is contained in:
Tom Hughes 2020-10-28 08:25:02 +00:00
commit b704f59769

View file

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