Commit dc399e66

mo k <mo@mokhan.ca>
2012-07-28 21:11:08
bundle update and fix imagemagick local install
master
1 parent ad6ca8e
Changed files (1)
Gemfile.lock
Gemfile.lock
@@ -151,7 +151,7 @@ GEM
     jasmine-core (1.2.0)
     journey (1.0.4)
     jquery-rails (2.0.2)
-      railties (< 5.0, >= 3.2.0)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.4)
     kaminari (0.13.0)
@@ -253,7 +253,7 @@ GEM
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)