diff options
| author | mo k <mo@mokhan.ca> | 2012-07-28 15:11:08 -0600 |
|---|---|---|
| committer | mo k <mo@mokhan.ca> | 2012-07-28 15:11:08 -0600 |
| commit | dc399e66c256ea0d758ccb7208939001be5ecff2 (patch) | |
| tree | 5f06effd5cb6bac9e36e57aad9c738e9edb94034 | |
| parent | ad6ca8ea0c568faa27d74e08e5c9a27050c79f11 (diff) | |
bundle update and fix imagemagick local install
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d247406a..7a191072 100644 --- a/Gemfile.lock +++ b/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) |