From 54db4d22f1c21be546184db637cbd7d9e09eb7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juho=20Veps=C3=A4l=C3=A4inen?= Date: Tue, 22 Dec 2020 14:21:45 +0100 Subject: [PATCH] docs: Update changelog --- CHANGELOG.md | 4 ++++ CONTRIBUTORS.md | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a391ee..f219dbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 5.7.3 / 2020-12-22 + +- Fix - Don't merge strings with objects in `mergeWithRules`. #172 + ## 5.7.2 / 2020-12-16 - Fix - If there's no match when using `merge` operation with `mergeWithRules`, use default merge behavior as a fallback. #167 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index cfe1350..a2410a4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -21,3 +21,4 @@ - [Adrien Harnay](https://github.com/adrienharnay) - Update README to comply with webpack API. #108 - [Paweł Lula](https://github.com/desfero) - Support `oneOf` at `merge.smart`. #111 - [Tomasz Wielga](https://github.com/trombka) - Allow `mergeUnique` to work with arbitrary order. #161 +- [JeB](https://github.com/just-jeb) - Don't merge strings with objects in `mergeWithRules`. #172