From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 Nov 2020 08:14:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2966' into master
X-Git-Tag: live~2872
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/835a1f9fcb8f5e54db98a12a2db7759a7ec0c755?hp=39a04dc7515792dba6613e63bad4facb0557efa0

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b489344a..b0a16c255 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -254,7 +254,7 @@ GEM
     kramdown (2.3.0)
       rexml
     libxml-ruby (3.2.1)
-    listen (3.3.0)
+    listen (3.3.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)