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

This commit is contained in:
Tom Hughes 2020-09-11 14:47:25 +01:00
commit 16f45e58f4

View file

@ -74,7 +74,7 @@ GEM
autoprefixer-rails (9.8.6.3) autoprefixer-rails (9.8.6.3)
execjs execjs
aws-eventstream (1.1.0) aws-eventstream (1.1.0)
aws-partitions (1.361.0) aws-partitions (1.367.0)
aws-sdk-core (3.105.0) aws-sdk-core (3.105.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
@ -83,7 +83,7 @@ GEM
aws-sdk-kms (1.37.0) aws-sdk-kms (1.37.0)
aws-sdk-core (~> 3, >= 3.99.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.79.1) aws-sdk-s3 (1.80.0)
aws-sdk-core (~> 3, >= 3.104.3) aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)