From: Tom Hughes <tom@compton.nu>
Date: Tue, 30 Jun 2020 18:06:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2680'
X-Git-Tag: live~2103
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a8011d8eb97b7586c3592e2e1e5e6792c914d082

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

a8011d8eb97b7586c3592e2e1e5e6792c914d082
diff --cc Gemfile.lock
index d8bf51fe5,9f8447196..3b47153b7
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -220,9 -220,9 +220,9 @@@ GE
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
      http_accept_language (2.1.1)
-     i18n (0.9.5)
+     i18n (1.8.3)
        concurrent-ruby (~> 1.0)
 -    i18n-js (3.7.0)
 +    i18n-js (3.7.1)
        i18n (>= 0.6.6)
      image_optim (0.26.5)
        exifr (~> 1.2, >= 1.2.2)