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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b4f473bb0c43528441c12686f03d6f98168aa61..3b489344aea2e0acf0009cead8120be11cac4523 100644 (file)
--- 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)