diff --git a/Gemfile.lock b/Gemfile.lock index 583e2ab..6ad399c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM coffee-script-source execjs coffee-script-source (1.1.2) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.2.9) multi_json (~> 1.0) @@ -48,7 +49,8 @@ GEM factory_girl (~> 2.1.0) railties (>= 3.0.0) hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jquery-rails (1.0.16) railties (~> 3.0) thor (~> 0.14) @@ -101,7 +103,7 @@ GEM sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.4) therubyracer (0.9.5) libv8 (~> 3.3.10)