From: Tom Hughes <tom@compton.nu>
Date: Thu, 19 Sep 2024 17:04:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5227'
X-Git-Tag: live~688
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f9e29ff7cffdf2c63924a63daadf8a5e065a5ffe?hp=6595d43e3cda580508a069e174d0059febcdc6ea

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1012a09db..732a89ae2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -258,7 +258,7 @@ GEM
       ffi (>= 1.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (3.25.4)
+    google-protobuf (3.25.5)
     hashdiff (1.1.1)
     hashie (5.0.0)
     highline (3.1.1)