summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorColby Swandale <me@colby.fyi>2018-12-11 20:21:04 +1100
committerColby Swandale <me@colby.fyi>2018-12-11 21:36:09 +1100
commit3fc4de72be1d46516160ce5056b38aad329806e2 (patch)
tree417619aa6b86f729573f981726aca29bccd45a3d /CHANGELOG.md
parentbfd68368a5ba23798da79f98b1c99f1b35e97caa (diff)
downloadbundler-3fc4de72be1d46516160ce5056b38aad329806e2.tar.gz
Version 1.17.2 with changelogv1.17.2
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33b9528d31..a32c73a1e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.17.2 (2018-12-11)
+
+ - Add compatibility for bundler merge with Ruby 2.6
+
## 1.17.1 (2018-10-25)
- Convert `Pathname`s to `String`s before sorting them, fixing #6760 and #6758 ([#6761](https://github.com/bundler/bundler/pull/6761), @alexggordon)