Skip to content

Commit 7f83aec

Browse files
authored
Merge pull request #53 from gjtorikian/release/v1.0.0
[skip test] Release v1.0.0
2 parents 6166a7f + 5b5e7f0 commit 7f83aec

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# [v1.0.0] - 25-02-2025
2+
## What's Changed
3+
* Add matrix to test CI by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/47
4+
* [breaking] Support Tailwind v4 by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/52
5+
6+
7+
**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.16.0...v1.0.0
18
# [v0.16.0] - 25-01-2025
29
## What's Changed
310
* Fix and improve implementation by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/50

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Utility function to efficiently merge [Tailwind CSS](https://tailwindcss.com/) classes without style conflicts. Essentially, a Ruby port of [tailwind-merge](https://github.com/dcastil/tailwind-merge).
44

5-
Supports Tailwind v3.0 up to v3.4.
5+
- Version 1.0 and above supports Tailwind v4.0+.
6+
- Versions below that support from v3.0 up to v3.4.
67

78
## Installation
89

0 commit comments

Comments
 (0)