Regenerate bundle with latest bundler

diff --git a/Gemfile.lock b/Gemfile.lock
index 3343161f9531efc4da5d244daa4f12a9074f3c04..241e79e92c55e690484c9e7d966a3cb6336f8351 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
     faraday (0.7.5)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.3)
     faraday (0.7.5)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.3)

-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)

     hike (1.2.1)
     httpclient (2.2.3)
     i18n (0.6.0)
     hike (1.2.1)
     httpclient (2.2.3)
     i18n (0.6.0)


@@ -120,7 +120,7 @@ GEM
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)

-      nokogiri (< 1.6, >= 1.4.4)
+      nokogiri (>= 1.4.4, < 1.6)

     sass (3.1.10)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
     sass (3.1.10)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)


@@ -130,7 +130,7 @@ GEM
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)

-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)

     therubyracer (0.9.9)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     therubyracer (0.9.9)
       libv8 (~> 3.3.10)
     thor (0.14.6)