Commit 3b4d13b9

mo k <mo@mokhan.ca>
2012-05-06 14:04:57
bundle update.
1 parent 22679d5
Changed files (1)
Gemfile.lock
@@ -137,7 +137,7 @@ GEM
     jasmine-core (1.1.0)
     journey (1.0.3)
     jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
+      railties (< 5.0, >= 3.2.0)
       thor (~> 0.14)
     json (1.7.0)
     kaminari (0.13.0)
@@ -208,8 +208,8 @@ GEM
     rspec-core (2.10.0)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.0)
-    rspec-rails (2.10.0)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -218,7 +218,7 @@ GEM
     rubyzip (0.9.8)
     rvm-capistrano (1.1.0)
       capistrano (>= 2.0.0)
-    sass (3.1.16)
+    sass (3.1.17)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -232,7 +232,7 @@ GEM
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)