Skip to content

Commit 2879c83

Browse files
authored
Merge branch 'main' into sync-53fbed3f
2 parents 8d87a3b + 1ca0b4c commit 2879c83

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

src/content/community/conferences.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,41 @@ March 22, 2024. In-person in Paris, France + Remote (hybrid)
108108

109109
[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/) - [Videos](https://www.youtube.com/playlist?list=PL53Z0yyYnpWhUzgvr2Nys3kZBBLcY0TA7)
110110

111+
### Frontend Nation 2024 {/*frontend-nation-2024*/}
112+
June 4 - 7, 2024. Online
113+
114+
[Website](https://frontendnation.com/) - [Twitter](https://twitter.com/frontendnation)
115+
116+
### App.js Conf 2024 {/*appjs-conf-2024*/}
117+
May 22 - 24, 2024. In-person in Kraków, Poland + remote
118+
119+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
120+
121+
### React Conf 2024 {/*react-conf-2024*/}
122+
May 15 - 16, 2024. In-person in Henderson, NV, USA + remote
123+
124+
[Website](https://conf.react.dev) - [Twitter](https://twitter.com/reactjs)
125+
126+
### React Native Connection 2024 {/*react-native-connection-2024*/}
127+
April 23, 2024. In-person in Paris, France
128+
129+
[Website](https://reactnativeconnection.io/) - [Twitter](https://twitter.com/ReactNativeConn)
130+
131+
### React Miami 2024 {/*react-miami-2024*/}
132+
April 19 - 20, 2024. In-person in Miami, FL, USA
133+
134+
[Website](https://reactmiami.com/) - [Twitter](https://twitter.com/ReactMiamiConf)
135+
136+
### Epic Web Conf 2024 {/*epic-web-2024*/}
137+
April 10 - 11, 2024. In-person in Park City, UT, USA
138+
139+
[Website](https://www.epicweb.dev/conf) - [YouTube](https://www.youtube.com/@EpicWebDev)
140+
141+
### React Paris 2024 {/*react-paris-2024*/}
142+
March 22, 2024. In-person in Paris, France + Remote (hybrid)
143+
144+
[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/)
145+
111146
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
112147
December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event)
113148

src/sidebarReference.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
},
180180
{
181181
=======
182-
>>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
182+
>>>>>>> 9967ded394d85af74e0ecdbf00feeb7921a28142
183183
"hasSectionHeader": true,
184184
"sectionHeader": "react-dom@{{version}}"
185185
},

0 commit comments

Comments
 (0)