Skip to content

Commit 37decef

Browse files
authored
Merge branch 'master' into master
2 parents 941d477 + d152955 commit 37decef

File tree

3 files changed

+85
-70
lines changed

3 files changed

+85
-70
lines changed

content/community/conferences.md

+33-18
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,16 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### Reactathon 2019 {#reactathon-2019}
16-
March 30-31, 2019 in San Francisco, USA
17-
18-
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
19-
20-
### App.js Conf 2019 {#appjs-conf-2019}
21-
April 4-5, 2019 in Kraków, Poland
22-
23-
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
24-
25-
### React Amsterdam 2019 {#react-amsterdam-2019}
26-
April 12, 2019 in Amsterdam, The Netherlands
27-
28-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
29-
30-
### ReactJS Girls Conference {#reactjs-girls-conference}
15+
### ReactJS Girls Conference
3116
May 3, 2019 in London, UK
3217

3318
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
3419

20+
### <React.NotAConf /> 2019 {#reactnotaconf--2019}
21+
May 11 in Sofia, Bulgaria
22+
23+
[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156)
24+
3525
### ReactEurope 2019 {#reacteurope-2019}
3626
May 23-24, 2019 in Paris, France
3727

@@ -87,6 +77,16 @@ September 26-28, 2019 in Alicante, Spain
8777

8878
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
8979

80+
### React Advanced 2019 {#react-advanced-2019}
81+
October 25, 2019 in London, UK
82+
83+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
84+
85+
### React Day Berlin 2019 {#react-day-berlin-2019}
86+
December 6, 2019 in Berlin, Germany
87+
88+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
89+
9090
## Past Conferences {#past-conferences}
9191

9292
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -114,7 +114,7 @@ February 22 & 23 in San Francisco, CA
114114
### React Amsterdam 2016 {#react-amsterdam-2016}
115115
April 16 in Amsterdam, The Netherlands
116116

117-
[Website](https://react.amsterdam/2016) - [Videos](https://youtu.be/sXDZBxbRRag?list=PLNBNS7NRGKMG3uLrm5fgY02hJ87Wzb4IU)
117+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
118118

119119
### ReactEurope 2016 {#reacteurope-2016}
120120
June 2 & 3 in Paris, France
@@ -164,7 +164,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
164164
### React Amsterdam 2017 {#react-amsterdam-2017}
165165
April 21st in Amsterdam, The Netherlands
166166

167-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://www.youtube.com/watch?v=NQyL-Dm7Kig&list=PLNBNS7NRGKMHxfm0CcYNuINLdRw7r4a9M)
167+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
168168

169169
### ReactEurope 2017 {#reacteurope-2017}
170170
May 18th & 19th in Paris, France
@@ -360,3 +360,18 @@ November 30, Berlin, Germany
360360
January 31, 2019 in Tehran, Iran
361361

362362
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
363+
364+
### Reactathon 2019 {#reactathon-2019}
365+
March 30-31, 2019 in San Francisco, USA
366+
367+
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
368+
369+
### App.js Conf 2019 {#appjs-conf-2019}
370+
April 4-5, 2019 in Kraków, Poland
371+
372+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
373+
374+
### React Amsterdam 2019 {#react-amsterdam-2019}
375+
April 12, 2019 in Amsterdam, The Netherlands
376+
377+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)

content/docs/addons-shallow-compare.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ category: Reference
88

99
> Note:
1010
>
11-
> `shallowCompare` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
11+
> `shallowCompare` is a legacy add-on. Use [`React.memo`](/docs/react-api.html#reactmemo) or [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
1212
1313
**Importing**
1414

0 commit comments

Comments
 (0)