From: Tom Hughes <tom@compton.nu>
Date: Fri, 14 Aug 2020 08:28:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2773'
X-Git-Tag: live~2027
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/07feac3cd93d28cf3db4cc847b8289657db37094?hp=337f08ceadcc7b10a5bd8e9e05576fa7d8e00354

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 236a0015a..7ecd0abe3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,7 +213,7 @@ GEM
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.13.1)
-    ffi-libarchive (1.0.3)
+    ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)