Skip to content

Commit acf3f77

Browse files
committed
Merge branch 'main' into release-next
2 parents 27de8e2 + 7037428 commit acf3f77

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ We manage release notes in this file instead of the paginated Github Releases Pa
4141
- [What's Changed](#whats-changed)
4242
- [Minor Changes](#minor-changes-1)
4343
- [Patch Changes](#patch-changes-1)
44+
- [\<\<\<\<\<\<\< HEAD](#-head)
4445
- [v6.27.0](#v6270)
4546
- [What's Changed](#whats-changed-1)
4647
- [Stabilized APIs](#stabilized-apis)
@@ -792,6 +793,8 @@ async function fakeGetSlugsFromCms() {
792793

793794
# **Full Changelog**: [`v6.28.0...v7.0.0`](https://github.com/remix-run/react-router/compare/[email protected]@7.0.0)
794795

796+
> > > > > > > release-next
797+
795798
## v6.28.0
796799

797800
Date: 2024-11-06
@@ -812,8 +815,12 @@ Date: 2024-11-06
812815

813816
**Full Changelog**: [`v6.27.0...v6.28.0`](https://github.com/remix-run/react-router/compare/[email protected]@6.28.0)
814817

818+
# <<<<<<< HEAD
819+
815820
> > > > > > > dev
816821
822+
> > > > > > > release-next
823+
817824
## v6.27.0
818825

819826
Date: 2024-10-11

contributors.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
- morleytatro
200200
- ms10596
201201
- mspiess
202+
- mtendekuyokwa19
202203
- mtliendo
203204
- ned-park
204205
- nilubisan
@@ -218,6 +219,7 @@
218219
- pavsoldatov
219220
- pcattori
220221
- petersendidit
222+
- printfn
221223
- promet99
222224
- pyitphyoaung
223225
- refusado
@@ -244,11 +246,13 @@
244246
- shivamsinghchahar
245247
- SimenB
246248
- SkayuX
249+
- skratchdot
247250
- smithki
248251
- soartec-lab
249252
- sorrycc
250253
- souzasmatheus
251254
- srmagura
255+
- SsongQ-92
252256
- stasundr
253257
- stmtk1
254258
- sukvvon
@@ -272,6 +276,7 @@
272276
- TooTallNate
273277
- triangularcube
274278
- trungpv1601
279+
- ttys026
275280
- Tumas2
276281
- turansky
277282
- tyankatsu0105
@@ -285,6 +290,7 @@
285290
- vitekzach
286291
- vonagam
287292
- WalkAlone0325
293+
- whxhlgy
288294
- willemarcel
289295
- williamsdyyz
290296
- willsawyerrrr

0 commit comments

Comments
 (0)