Skip to content

Commit 6654478

Browse files
authored
Merge branch 'master' into master
2 parents cad3438 + 7d193a1 commit 6654478

File tree

5 files changed

+19
-2
lines changed

5 files changed

+19
-2
lines changed

content/community/conferences.md

+5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ April 23 - 24, 2020 in Kraków, Poland
3737

3838
[Website](http://appjs.co/react) - [Twitter](https://twitter.com/appjsconf)
3939

40+
### React Day Bangalore 2020 {#react-day-bangalore-2020}
41+
April 25, 2020 in Bangalore, India
42+
43+
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn)
44+
4045
### render(ATL) 2020 {#render-atlanta-2020}
4146
May 4-6, 2020. Atlanta, GA, USA.
4247

content/community/meetups.md

+10
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
2222
## Brazil {#brazil}
2323
* [Belo Horizonte](https://www.meetup.com/reactbh/)
2424
* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
25+
* [Florianópolis](https://www.meetup.com/pt-br/ReactJS-Floripa/)
26+
* [Goiânia](https://www.meetup.com/pt-br/React-Goiania/)
2527
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
28+
* [Juiz de Fora](https://www.meetup.com/pt-br/React-Juiz-de-Fora/)
29+
* [Maringá](https://www.meetup.com/pt-BR/React-Maringa/)
30+
* [Porto Alegre](https://www.meetup.com/pt-BR/React-Porto-Alegre/)
2631
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
32+
* [Salvador](https://www.meetup.com/pt-BR/ReactSSA)
2733
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
2834
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)
2935

@@ -75,6 +81,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
7581
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
7682
* [Jaipur](https://www.meetup.com/JaipurJS-Developer-Meetup/)
7783

84+
## Indonesia {#indonesia}
85+
* [Indonesia](https://www.meetup.com/reactindonesia/)
86+
7887
## Ireland {#ireland}
7988
* [Dublin](https://www.meetup.com/ReactJS-Dublin/)
8089

@@ -137,6 +146,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
137146
* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
138147
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
139148
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
149+
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
140150
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
141151
* [Kansas City, MO - ReactJS](https://www.meetup.com/Kansas-City-React-Meetup/)
142152
* [Las Vegas, NV - ReactJS](https://www.meetup.com/ReactVegas/)

content/docs/concurrent-mode-suspense.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ Suspense answers some questions, but it also poses new questions of its own:
668668

669669
* If some component "suspends", does the app freeze? How to avoid this?
670670
* What if we want to show a spinner in a different place than "above" the component in a tree?
671-
* If we intentionally *want* to show an inconsistent UI for a small period time, can we do that?
671+
* If we intentionally *want* to show an inconsistent UI for a small period of time, can we do that?
672672
* Instead of showing a spinner, can we add a visual effect like "greying out" the current screen?
673673
* Why does our [last Suspense example](https://codesandbox.io/s/infallible-feather-xjtbu) log a warning when clicking the "Next" button?
674674

content/versions.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- title: '16.11'
2+
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16110-october-22-2019
13
- title: '16.10.2'
24
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16102-october-3-2019
35
- title: '16.10.1'

src/site-constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// NOTE: We can't just use `location.toString()` because when we are rendering
99
// the SSR part in node.js we won't have a proper location.
1010
const urlRoot = 'https://ko.reactjs.org';
11-
const version = '16.10.2';
11+
const version = '16.11.0';
1212
const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
1313

1414
export {babelURL, urlRoot, version};

0 commit comments

Comments
 (0)