From: Tom Hughes <tom@compton.nu>
Date: Mon, 28 Sep 2020 07:46:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2855'
X-Git-Tag: live~1963
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dc9f90c7b3af30a40b740428ee39a13756f64c43?hp=3691171259feb482b1416100666c1ac7932180a2

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

diff --git a/Gemfile.lock b/Gemfile.lock
index dbe04230b..7dd7d5402 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -146,7 +146,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
-    dalli (2.7.10)
+    dalli (2.7.11)
     debug_inspector (0.0.3)
     deep_merge (1.2.1)
     delayed_job (4.1.8)