summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md11
-rw-r--r--lib/bundler/version.rb2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67e64470e2..07d62aed55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.0.20 (September 27, 2011)
+
+Features:
+
+ - Add platform :maglev (@timfel, #1444)
+
+Bugfixes:
+
+ - Ensure yaml is required even if psych is found
+ - Handle directory names that contain invalid regex characters
+
## 1.0.20.rc (September 18, 2011)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index cef3a48a43..d88c33782a 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.0.20.rc" unless defined?(::Bundler::VERSION)
+ VERSION = "1.0.20" unless defined?(::Bundler::VERSION)
end