From: Tom Hughes <tom@compton.nu>
Date: Mon, 9 Nov 2020 08:11:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2942' into master
X-Git-Tag: live~2431
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/28fffd1f946fbf408e4fef2028a2fb03f548dab3?hp=9c86fa4e2e77d3c550d9578b12ad332f89a0c2e9

Merge remote-tracking branch 'upstream/pull/2942' into master
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 2d518d88e..97e9f83b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.5.0)
       msgpack (~> 1.0)
-    bootstrap (4.5.2)
+    bootstrap (4.5.3)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
@@ -453,7 +453,7 @@ GEM
     tilt (2.0.10)
     tins (1.25.0)
       sync
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -470,7 +470,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby