From: Tom Hughes <tom@compton.nu>
Date: Thu, 15 Oct 2020 07:12:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2887'
X-Git-Tag: live~3287
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/96f426a2eaa6009496b0f51934a497b3c970db97?hp=ad9f0b624728259fbe17f7b631d3efef5a488d3b

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 67a70b8e4..0d3627354 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,7 +226,7 @@ GEM
     http_accept_language (2.1.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.7.1)
+    i18n-js (3.8.0)
       i18n (>= 0.6.6)
     image_optim (0.27.1)
       exifr (~> 1.2, >= 1.2.2)