diff options
author | André Arko <andre@arko.net> | 2012-05-27 19:55:50 -0700 |
---|---|---|
committer | André Arko <andre@arko.net> | 2012-05-27 19:55:50 -0700 |
commit | 07df32229a754f34828199a3b5c216175f82a095 (patch) | |
tree | a687a0ad4390a58a580fb774b8d101f69c7c94cb /bin | |
parent | 63a6a93e7a7f3ef635689cb91478065c078d9313 (diff) | |
parent | e1d71e7948537333f5b46d8532e4bf0afc3a8ba0 (diff) | |
download | bundler-07df32229a754f34828199a3b5c216175f82a095.tar.gz |
Merge v1.1.4 from branch '1-1-stable'
Conflicts:
CHANGELOG.md
bin/bundle
lib/bundler/version.rb
spec/install/gems/dependency_api_spec.rb
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bundle | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -8,6 +8,7 @@ $:.each do |path| abort(err) end end + require 'bundler/cli' require 'bundler/friendly_errors' -Bundler.with_friendly_errors {Bundler::CLI.start } +Bundler.with_friendly_errors { Bundler::CLI.start } |