From: Tom Hughes <tom@compton.nu>
Date: Mon, 3 Aug 2020 07:44:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2748'
X-Git-Tag: live~3074
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/528d29af6397c4d0fe124abea8d1c09a3e51fed8?hp=597b4684cc53f63eac4546c4065b9447e6a53158

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

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