summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-05-28 13:22:18 -0700
committerAndre Arko <andre@arko.net>2015-05-28 13:22:18 -0700
commit5b427ef3e5aa0a31633890864dee9ce1ddf244f3 (patch)
tree57d508bf15830c13c957ee1f90aac10d4ab6c43f
parenta19ebe73b6ba9436ce57956c2a1e1a92150ab018 (diff)
downloadbundler-5b427ef3e5aa0a31633890864dee9ce1ddf244f3.tar.gz
Version 1.10.0 with changelogv1.10.0
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/bundler/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dee71228e..5cc8bea03d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.10.0 (2015-05-28)
+
+(this space intentionally left blank)
+
## 1.10.0.rc (2015-05-16)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index d83055a683..59fbe9c349 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.10.0.rc" unless defined?(::Bundler::VERSION)
+ VERSION = "1.10.0" unless defined?(::Bundler::VERSION)
end