Skip to content

Commit 2e29cbc

Browse files
authored
Merge pull request #60 from reactjs/sync-53fbed3f
2 parents ab0013e + 7a2b483 commit 2e29cbc

File tree

4 files changed

+31
-4
lines changed

4 files changed

+31
-4
lines changed

src/content/community/conferences.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1010

1111
## Upcoming Conferences {/*upcoming-conferences*/}
1212

13+
<<<<<<< HEAD
1314
<<<<<<< HEAD
1415
<<<<<<< HEAD
1516
### React Summit 2024 {/*react-summit-2024*/}
@@ -90,6 +91,8 @@ June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybri
9091

9192
[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway)
9293

94+
=======
95+
>>>>>>> 53fbed3f676013508fb9cce22a3fc8664b1dc5a1
9396
### React Nexus 2024 {/*react-nexus-2024*/}
9497

9598
July 04 & 05, 2024. Bangalore, India (In-person event)
@@ -128,8 +131,33 @@ October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - re
128131

129132
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
130133

134+
### React Brussels 2024 {/*react-brussels-2024*/}
135+
October 18, 2024. In-person in Brussels, Belgium (hybrid event)
136+
137+
[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact)
138+
139+
### React Africa 2024 {/*react-africa-2024*/}
140+
November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
141+
142+
[Website](https://react-africa.com/) - [Twitter](https://x.com/BeJS_)
143+
131144
## Past Conferences {/*past-conferences*/}
132145

146+
### React Summit 2024 {/*react-summit-2024*/}
147+
June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
148+
149+
[Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
150+
151+
### React Norway 2024 {/*react-norway-2024*/}
152+
June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybrid event).
153+
154+
[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway)
155+
156+
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
157+
June 12 - June 14, 2024. Atlanta, GA, USA
158+
159+
[Website](https://renderatl.com) - [Discord](https://www.renderatl.com/discord) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl) - [Podcast](https://www.renderatl.com/culture-and-code#/)
160+
133161
### Frontend Nation 2024 {/*frontend-nation-2024*/}
134162
June 4 - 7, 2024. Online
135163

@@ -163,7 +191,7 @@ April 10 - 11, 2024. In-person in Park City, UT, USA
163191
### React Paris 2024 {/*react-paris-2024*/}
164192
March 22, 2024. In-person in Paris, France + Remote (hybrid)
165193

166-
[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/)
194+
[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)
167195

168196
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
169197

src/content/community/meetups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
100100
* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
101101
* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
102102
* [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup)
103-
* [Chennai](https://www.meetup.com/React-Chennai/)
103+
* [Chennai](https://www.linkedin.com/company/chennaireact)
104104
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
105105
* [Mumbai](https://reactmumbai.dev)
106106
* [Pune](https://www.meetup.com/ReactJS-and-Friends/)

src/content/learn/react-compiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ module.exports = reactCompilerLoader;
351351

352352
### Expo {/*usage-with-expo*/}
353353

354-
Expo uses Babel via Metro, so refer to the [Usage with Babel](#usage-with-babel) section for installation instructions.
354+
Please refer to [Expo's docs](https://docs.expo.dev/preview/react-compiler/) to enable and use the React Compiler in Expo apps.
355355

356356
### Metro (React Native) {/*usage-with-react-native-metro*/}
357357

src/pages/_document.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ const MyDocument = () => {
8787
}
8888
}
8989
const uwuQueryParam = checkQueryParam();
90-
console.log('uwuQueryParam', uwuQueryParam);
9190
if (uwuQueryParam != null) {
9291
setUwu(uwuQueryParam);
9392
} else if (checkLocalStorage()) {

0 commit comments

Comments
 (0)