From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Nov 2020 09:39:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2949' into master
X-Git-Tag: live~2925
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1e03bd31032f80e3bd05253e160614b2b16b647b?hp=cacbf42b2900038ab51c9467ab361571aa420423

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 30945b73a..77aa0e4d7 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.83.2)
+    aws-sdk-s3 (1.84.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)