From 6b5ef030a21330c7866b5e35b9d393c815a4a23d Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 26 Oct 2020 11:16:30 -0400 Subject: [PATCH] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 703b15f27..e555cccb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support flattening deeply nested color objects ([#2148](https://github.com/tailwindlabs/tailwindcss/pull/2148)) - Support defining presets as functions ([#2680](https://github.com/tailwindlabs/tailwindcss/pull/2680)) +### Changed + +- Merge `extend` objects deeply by default ([#2679](https://github.com/tailwindlabs/tailwindcss/pull/2679)) + ## [2.0.0-alpha.2] - 2020-10-25 ### Added