From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Aug 2020 07:20:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2769'
X-Git-Tag: live~3058
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6214fbacf2ba7c932721bd7bdbeb6fe0ef13b0e3?hp=7d1cb86c392f12e3cbd2fb90cbe8374fbed17279

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d4a2befc..880d287ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    aasm (5.1.0)
+    aasm (5.1.1)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.3.2)
       actionpack (= 6.0.3.2)