From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 Feb 2021 11:56:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3100'
X-Git-Tag: live~2745
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/101c2af87e8d5a449e039587e4e79f3c39950b14?hp=5761371a561f785e17e5403cd47f76ecd3604eff

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 76004cef9..dc0833a98 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,7 +129,7 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
-    composite_primary_keys (12.0.7)
+    composite_primary_keys (12.0.8)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.8)
     config (2.2.3)