aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-05-04 18:29:22 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-05-04 18:29:22 -0500
commit3ffc23ed7cb1279ed37201ea48086d418666068d (patch)
tree5e2ded4e0ce08ceaac1323d207e6808fcae2b218 /CHANGELOG.md
parent4b09898a8d7f73fd83a8e3d1840344ceb44b0964 (diff)
downloadbundler-3ffc23ed7cb1279ed37201ea48086d418666068d.tar.gz
Version 1.12.2 with changelog
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dd1af44..0061bc22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.12.2 (2016-05-04)
+
+Bugfixes:
+ - fix modifying a frozen string when the resolver conflicts on dependencies with requirements (#4520, @grzuy)
+ - fix `bundle exec foo --help` not showing the invoked command's help (#4480, @b-ggs)
+
## 1.12.1 (2016-04-30)
Bugfixes: