diff --git a/Gemfile.lock b/Gemfile.lock index ef55a4d..343f04f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) daemons (1.1.9) diff-lcs (1.1.3) erubis (2.7.0) @@ -61,29 +62,30 @@ GEM railties (>= 3.0.0) ffi (1.1.5) hike (1.2.3) - i18n (0.6.11) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.1.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.8.1) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) libwebsocket (0.1.5) addressable mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.10.1) + multi_json (1.14.1) nokogiri (1.5.5) opentok (0.0.91) pg (0.14.1) polyglot (0.3.5) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.20) actionmailer (= 3.2.20) @@ -100,7 +102,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.3.2) + rake (13.0.0) rdoc (3.12.2) json (~> 1.4) rspec (2.11.0) @@ -153,7 +155,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.19.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot