diff options
| author | Colby Swandale <me@colby.fyi> | 2018-12-11 21:47:10 +1100 |
|---|---|---|
| committer | Colby Swandale <me@colby.fyi> | 2018-12-11 21:47:10 +1100 |
| commit | a845a0d56c5f68999b0dfd87c95d5c456dacdc57 (patch) | |
| tree | fadce93fe41d80d47dd96aadf3e429b60cde7a16 | |
| parent | cca1f63bffc47c7b016810d24e13e2dd4fdced12 (diff) | |
| parent | 3fc4de72be1d46516160ce5056b38aad329806e2 (diff) | |
| download | bundler-a845a0d56c5f68999b0dfd87c95d5c456dacdc57.tar.gz | |
Merge branch '1-17-stable'
* 1-17-stable:
Version 1.17.2 with changelog
Merge #6798
Merge #6818
Merge #6786
Merge #6743
Merge #6742
Merge #6740
Merge #6834
Merge pull request #6752 from bundler/indirect/backport-6737
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 155c2503f0..95f087d0b9 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) |