diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2015-12-12 18:03:03 -0800 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2015-12-12 18:03:03 -0800 |
| commit | ffb2819356b253123fe600fef1ae42504beeea5b (patch) | |
| tree | e90a3085e76dfd0faf9622b9f01e6ca2d4c8f250 | |
| parent | a6cd3191f623b811416c6e89bd0b175f707fc9ed (diff) | |
| parent | 92691a732a86f2f0a57e958023ac6edfba719fbd (diff) | |
| download | bundler-ffb2819356b253123fe600fef1ae42504beeea5b.tar.gz | |
Merge tag 'v1.11.0'
Version 1.11.0
| -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 a6b47b7d8f..31469144e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +<<<<<<< HEAD +======= +## 1.11.0 (2015-12-12) + +(this space intentionally left blank) + +>>>>>>> v1.11.0 ## 1.11.0.pre.2 (2015-12-06) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index d753d21cdc..97811e5934 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.11.0.pre.2" unless defined?(::Bundler::VERSION) + VERSION = "1.11.0" unless defined?(::Bundler::VERSION) end |