From: Tom Hughes Date: Fri, 6 Nov 2020 08:17:13 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2939' into master X-Git-Tag: live~3105 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5dcb0737da48706fde539da00b8c6259d0aee136?hp=e6d4bd8f17a7fdebd77aa3be3edc459fb7e1fac8 Merge remote-tracking branch 'upstream/pull/2939' into master --- diff --git a/Gemfile.lock b/Gemfile.lock index 2a1e431a3..e1ab9112b 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.3) + webmock (3.9.4) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0)