diff options
author | Bundlerbot <bot@bundler.io> | 2019-12-17 11:55:01 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-12-17 11:55:01 +0000 |
commit | b932700858f058c88c2f927c1fd61f7669b8a5c6 (patch) | |
tree | 4a4ac6235bedcf4475ba90fe07e2f2efaba56e72 /lib | |
parent | f54ae4f4b2e287792f53410dec42e6b26b3dfcaa (diff) | |
parent | 1df1b577f1d5fc9b15b106d80580e86016009c88 (diff) | |
download | bundler-b932700858f058c88c2f927c1fd61f7669b8a5c6.tar.gz |
Merge #7497
7497: Merge changelog and version bump back to master r=hsbt a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was that version and changelog need to be cherry-picked from the stable branch.
### What is your fix for the problem, implemented in this PR?
My fix is to do just that.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 4cf11c5fb5..417b21f18a 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.1.0.pre.3".freeze + VERSION = "2.1.0".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i |