diff --git a/Gemfile.lock b/Gemfile.lock index bf61a17..a588454 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,7 +23,7 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - active_utils (2.0.1) + active_utils (2.2.3) activesupport (>= 2.3.11) i18n activemerchant (1.42.4) @@ -74,6 +74,7 @@ GEM execjs coffee-script-source (1.6.3) columnize (0.3.6) + concurrent-ruby (1.1.9) daemons (1.1.9) debugger (1.6.5) columnize (>= 0.3.1) @@ -105,7 +106,8 @@ GEM haml (3.1.8) hashie (2.0.5) hike (1.2.3) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -129,10 +131,8 @@ GEM mini_portile (0.5.2) mocha (1.0.0) metaclass (~> 0.0.1) - monetize (0.1.3) - money (6.0.1) - i18n (~> 0.6.4) - monetize (~> 0.1.3) + money (6.16.0) + i18n (>= 0.6.4, <= 2) multi_json (1.0.4) multi_xml (0.4.4) multipart-post (1.2.0)