From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Jul 2020 07:28:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2683'
X-Git-Tag: live~3462
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/02184fae74fa4d1362de400cee5bd4f2d4a356e3?hp=05858662021553ce0b86720dd62ccbd08788979f

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b47153b7..5bd65a630 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -243,7 +243,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.3.0)
+    json (2.3.1)
     jwt (2.2.1)
     kgio (2.11.3)
     kramdown (2.3.0)