From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Nov 2020 08:21:45 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2951' into master
X-Git-Tag: live~2906
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6c1f535d5fdd84498f40a0d9e5a6af746a66bbed?hp=f7c5c011e3b1feaf12cff6b86834b1bd67a67be0

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1d868a95b..70d88a63b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.84.0)
+    aws-sdk-s3 (1.84.1)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)