From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Jun 2020 09:32:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2679'
X-Git-Tag: live~3106
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/efaddc5070c175e9f6acfe8cb9ed0bb15e89bf84?hp=-c

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

efaddc5070c175e9f6acfe8cb9ed0bb15e89bf84
diff --combined Gemfile.lock
index c02d52eaf,92c2eb4a5..2f023eba1
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,7 -74,7 +74,7 @@@ GE
      autoprefixer-rails (9.8.4)
        execjs
      aws-eventstream (1.1.0)
-     aws-partitions (1.335.0)
+     aws-partitions (1.336.0)
      aws-sdk-core (3.102.1)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.35.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.71.1)
+     aws-sdk-s3 (1.72.0)
        aws-sdk-core (~> 3, >= 3.102.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -246,7 -246,7 +246,7 @@@
      json (2.3.0)
      jwt (2.2.1)
      kgio (2.11.3)
 -    kramdown (2.2.1)
 +    kramdown (2.3.0)
        rexml
      libxml-ruby (3.2.0)
      listen (3.2.1)