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

diff --git a/Gemfile.lock b/Gemfile.lock
index fae8b859451596e3ae45ecae8dc8f9a87ad27d29..399e39793e595698a401c6e7ae8fbb8a50d12cd5 100644 (file)
--- 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)