Merge branch 'dev' into upgrade/rails-5-2

This commit is contained in:
Brenda Wallace authored and GitHub committed 2019-01-04 20:41:52 +13:00
commit efc8fb85cb
1 file changed
+1 -1
+1 -1
View File
@@ -423,7 +423,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
rubocop-rspec (1.30.1)
rubocop-rspec (1.31.0)
rubocop (>= 0.60.0)
ruby-progressbar (1.10.0)
ruby-units (2.3.1)