aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2014-07-22 21:53:52 -0700
committerAndre Arko <andre@arko.net>2014-07-22 21:53:52 -0700
commitfb65ebe5aec8f67617031a0f1232b8ee5744411b (patch)
tree9a0c1eeccf6a7c0fa6ac4a272130a5d88727ec2d /lib
parent95012c9a07c5d649c9052d3976846e0b95de3164 (diff)
parent7fce490d0b1b1ea92c1a94cfac55c88dc678a485 (diff)
downloadbundler-fb65ebe5aec8f67617031a0f1232b8ee5744411b.tar.gz
Merge tag 'v1.6.4'
Version 1.6.4 Conflicts: CHANGELOG.md Rakefile bundler.gemspec lib/bundler/cli.rb lib/bundler/parallel_workers.rb lib/bundler/templates/newgem/gitignore.tt lib/bundler/templates/newgem/newgem.gemspec.tt spec/quality_spec.rb
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 398a6629..fc8e643d 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,5 @@ module Bundler
# We're doing this because we might write tests that deal
# with other versions of bundler and we are unsure how to
# handle this better.
- VERSION = "1.6.3" unless defined?(::Bundler::VERSION)
+ VERSION = "1.6.4" unless defined?(::Bundler::VERSION)
end