summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-06-22 17:28:49 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-06-22 17:28:49 -0700
commitab6f7aa8a3d8e15670a41f70ca803639798a4609 (patch)
tree05b247f409c76de932e6b01a454da63dea3fe446
parent6243269a8598b9446f14c21ac272e2de7af26d77 (diff)
parent0aec2b1af5ea45d1c9635054ea8ab9b547d3ed4d (diff)
downloadbundler-ab6f7aa8a3d8e15670a41f70ca803639798a4609.tar.gz
Merge tag 'v1.9.10'
Version 1.9.10 # Conflicts: # CHANGELOG.md # lib/bundler/definition.rb # lib/bundler/version.rb
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a0424f13a..0cb80bee5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,12 @@ Deprecations:
- deprecated the (never enabled) `bundle_ruby` binary (@smlance)
+## 1.9.10 (2015-06-22)
+
+Features:
+
+ - the `BUNDLED WITH` section of lockfiles generated by 1.10+ will be preserved (@segiddins)
+
## 1.9.9 (2015-05-16)
Bugfixes: