summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Arko <andre@arko.net>2013-10-02 16:53:03 -0700
committerAndré Arko <andre@arko.net>2013-10-02 16:53:03 -0700
commitb5aede7e9d36939638e0a361a4f276c80d376eae (patch)
tree8967ab1d9acbf165170081fcfc7c3feddf70ce01
parent0238a78fae6104345aa34ca533bc1fa3ac8b92dd (diff)
parent2bef8708720216652fd278892a8264b9fe7219bd (diff)
downloadbundler-b5aede7e9d36939638e0a361a4f276c80d376eae.tar.gz
Merge pull request #2657 from ghedamat/typo-fix
fix typo in CHANGELOG.md [ci skip]
-rw-r--r--CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e773fec7ad..a420c39129 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ Features:
- add :patchlevel option to ruby DSL
- add `bundler` bin (#2598, @kirs)
- friendly ambiguous error messages (#2581, #2550, @jlsuttles, @jendiamond, @joyicecloud)
- - add `:jruby_18` and `:jruby_19` paltform options (@mcfiredrill)
+ - add `:jruby_18` and `:jruby_19` platform options (@mcfiredrill)
- add X.509 client certificates for auth without passwords (@snackbandit)
- add `exec --keep-file-descriptors` for Ruby 1.9-like behavior on 2.0 (@steved555)
- print a better error when git is not installed (@joyicecloud)