Merge branch 'master' into moderation

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f73d4a5d8b578ba4ce393d4ff5e8a8a05c3433e5..0dcd5bd24b3ddd1021821dd0c1e1f427d402b98f 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
+    aasm (4.1.0)
     actioncable (5.0.5)
       actionpack (= 5.0.5)
       nio4r (>= 1.2, < 3.0)
@@ -348,6 +349,7 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
+  aasm
   actionpack-page_caching
   autoprefixer-rails
   bigdecimal (~> 1.1.0)