diff --git a/Gemfile.lock b/Gemfile.lock index de697ea..a46241a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,20 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.1.3) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.2.6) chunky_png (1.2.5) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) + coffee-script-source (1.12.2) compass (0.11.5) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) + concurrent-ruby (1.1.5) daemons (1.1.4) em-websocket (0.3.5) addressable (>= 2.1.1) @@ -32,7 +34,8 @@ GEM http_router (0.10.2) rack (>= 1.0.0) url_mount (~> 0.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json (1.6.5) maruku (0.6.0) syntax (>= 1.0.0) @@ -59,24 +62,24 @@ GEM middleman-livereload (0.2.1) guard-livereload (~> 0.3.1) multi_json (1.0.4) - padrino-core (0.10.5) - activesupport (~> 3.1.0) + padrino-core (0.10.6) + activesupport (~> 3.2.0) http_router (~> 0.10.2) sinatra (~> 1.3.1) thor (~> 0.14.3) tilt (~> 1.3.0) - padrino-helpers (0.10.5) + padrino-helpers (0.10.6) i18n (~> 0.6) - padrino-core (= 0.10.5) - rack (1.3.5) - rack-protection (1.1.4) + padrino-core (= 0.10.6) + rack (1.3.10) + rack-protection (1.5.5) rack rack-test (0.6.1) rack (>= 1.0) sass (3.1.11) - sinatra (1.3.1) - rack (~> 1.3, >= 1.3.4) - rack-protection (~> 1.1, >= 1.1.2) + sinatra (1.3.3) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) slim (1.0.4) temple (~> 0.3.4) @@ -93,7 +96,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - tilt (1.3.3) + tilt (1.3.7) uglifier (1.0.4) execjs (>= 0.3.0) multi_json (>= 1.0.2)