Skip to content

Sync with reactjs.org @ bbea5221 #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Nov 12, 2019
Merged

Sync with reactjs.org @ bbea5221 #185

merged 13 commits into from
Nov 12, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Nov 11, 2019

This PR was automatically generated.

Merge changes from reactjs.org at bbea522

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

tanhauhau and others added 12 commits November 4, 2019 22:59
Blog post: Building Great User Experiences with Concurrent Mode and Suspense
…h Concurrent Mode and Suspense" blog post (#2541)

* Update 2019-11-06-building-great-user-experiences-with-concurrent-mode-and-suspense.md

#2540 
I think `post` is `props.post`

* Update 2019-11-06-building-great-user-experiences-with-concurrent-mode-and-suspense.md
Recommended article link, written by Ben Schwarz, returns a 404. Updated with correct link.
@netlify
Copy link

netlify bot commented Nov 11, 2019

Deploy preview for ko-reactjs-org ready!

Built with commit 6e977fa

https://deploy-preview-185--ko-reactjs-org.netlify.com

@@ -176,7 +176,11 @@ Chrome에서 이 작업을 하려면

6. React 이벤트는 **User Timing** 라벨로 그룹화됩니다.

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to resolve conflict.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed by 6e977fa :)

@taehwanno taehwanno merged commit f69c2c9 into master Nov 12, 2019
@taehwanno taehwanno deleted the sync-bbea5221 branch November 12, 2019 15:04
@taehwanno taehwanno mentioned this pull request Nov 12, 2019
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.