Merge branch 'master' into moderation

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index bbfb73c5a6e67f604d2ae177ba56b6750c5143d3..02bb3e5fdbeaf3634243e6ca46721cdddf7caaa2 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.1.5)
       actionpack (= 5.1.5)
       nio4r (~> 2.0)
@@ -354,6 +355,7 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
+  aasm
   actionpack-page_caching
   annotate
   autoprefixer-rails