Skip to content

Sync with reactjs.org @ 647b6392 #173

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 15 commits into from
Oct 3, 2019
Merged

Sync with reactjs.org @ 647b6392 #173

merged 15 commits into from
Oct 3, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Sep 30, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 647b639

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.

robinpokorny and others added 12 commits September 24, 2019 10:26
* Add doc for context displayaName

* Add highlight for js doc

* Fix context display name link

* Fix context displayName comment
* Update Versioning FAQ

Includes a new section describing our approach to minor releases, and
why they don't always include new features.

* Brian's edits

* Delete the adverb
* Add React UI Tools to Fee Components List

:

* Update tools-ui-components.md


Co-authored-by: Alexey Pyltsyn <lex61rus@gmail.com>
The sections on branch organization and versioning were outdated. I also
added a section on feature flags.
Added Vila Velha React Meetup in Brazil
@netlify
Copy link

netlify bot commented Sep 30, 2019

Deploy preview for ko-reactjs-org ready!

Built with commit 6a11548

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


For example, the following component will appear as MyDisplayName in the DevTools:
예를 들어, 아래 컴포넌트는 개발자 도구에 MyDisplayName로 표시됩니다.
Copy link
Member

Choose a reason for hiding this comment

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

This section is newly added. I translated it.

@taehwanno taehwanno merged commit 68b1fd3 into master Oct 3, 2019
@taehwanno taehwanno deleted the sync-647b6392 branch October 3, 2019 06:15
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.

10 participants