From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Oct 2020 07:57:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2868'
X-Git-Tag: live~2964
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1affed4b2d93f4259509a5bb674f7c0b00b850f9?hp=42711d951acf45a6cb9246f064279f94946acf5d

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b6a2886c1..79ebb3f7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -389,7 +389,7 @@ GEM
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)
-    rotp (6.1.0)
+    rotp (6.2.0)
     rubocop (0.92.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)