diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index eb7d07850e..a7adef9b2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.14.2 (2017-01-22) + +Bugfixes: + + - fix using `force_ruby_platform` on windows (#5344, @segiddins) + - fix an incorrect version conflict error when using `gemspec` on multiple platforms (#5340, @segiddins) + ## 1.14.1 (2017-01-21) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index ebd878e0ff..4bbb17c9da 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,5 +7,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.14.1" unless defined?(::Bundler::VERSION) + VERSION = "1.14.2" unless defined?(::Bundler::VERSION) end |