From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 Nov 2020 08:14:44 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2967' into master
X-Git-Tag: live~1859
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8d2fbc63a4319e424d23ac71f6372415ccf0a7b2?hp=241f9c422c5c95a211d6114d5101a91c825c5896

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 04befa66d..71317a646 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)