Merge branch 'master' into develop

This commit is contained in:
Jonathan Abbett 2018-07-20 09:21:07 -04:00
commit 6740cd98a9

View File

@ -3,7 +3,7 @@ PATH
specs:
abraham (1.3)
jquery-rails
rails (~> 5.0.0, >= 5.0.0.1)
rails (~> 5.0, >= 5.0.0.1)
rails-assets-js-cookie (~> 2.1)
rails-assets-shepherd.js (~> 1.8)
sass-rails (~> 5.0)