summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <me@colby.fyi>2018-10-30 09:58:58 +1100
committerColby Swandale <me@colby.fyi>2018-10-30 09:58:58 +1100
commit42a32302ea53fec35d6f7911315de870343eb722 (patch)
tree55d9c61378e0fbadce00f8a26213888ba064d0a0
parent27ab011a686cfbd99fdee56362f68b961458f976 (diff)
parent2760d72d3b2a1070b279536c33d3a89aaad7426b (diff)
downloadbundler-42a32302ea53fec35d6f7911315de870343eb722.tar.gz
Merge remote-tracking branch 'origin/1-17-stable'
* origin/1-17-stable: Version 1.17.1 with changelog Merge #6761
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81d20cdde7..155c2503f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 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)
+
## 1.17.0 (2018-10-25)
No new changes.