From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Nov 2020 09:49:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2958' into master
X-Git-Tag: live~2898
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fa2177710b748e28ab57ffbb48a88e7327e841da?hp=74e6b468aca7b6a716efbdfa1941448d3c48bb4b

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b4f473bb..3b489344a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -461,7 +461,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
-    webmock (3.9.5)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)