From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Sep 2020 07:24:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2832'
X-Git-Tag: live~2832
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/17096f9e9e08ebbc4439efe6eff6328473cbc290

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

17096f9e9e08ebbc4439efe6eff6328473cbc290
diff --cc Gemfile.lock
index 9af09cc96,789199ca9..ceadafa8d
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,11 -71,11 +71,11 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
-     autoprefixer-rails (9.8.6.3)
+     autoprefixer-rails (10.0.0)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.367.0)
 -    aws-sdk-core (3.105.0)
 +    aws-partitions (1.370.0)
 +    aws-sdk-core (3.107.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)