From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Sep 2021 21:11:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3330'
X-Git-Tag: live~2479
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a3a14eb01addace8d1cf6d1aa6bcc5f62f2c4898?hp=397a03d780f8b5c5824850ae99ffdb4769dcb0c8

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2f8e120da..00da83e1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,7 +290,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)
-    nokogiri (1.12.4)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     oauth (0.4.7)