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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 77aa0e4d7..1d868a95b 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.4)
+    webmock (3.9.5)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)