Skip to content

Sync with reactjs.org @ 49fd7d5f #399

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 17 commits into from
Apr 12, 2021
Merged

Sync with reactjs.org @ 49fd7d5f #399

merged 17 commits into from
Apr 12, 2021

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Apr 5, 2021

This PR was automatically generated.

Merge changes from reactjs.org at 49fd7d5

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.

mushmelty and others added 16 commits February 16, 2021 12:04
* Clarify the definition of "inside conditions"

* Make clarification more concise

Co-authored-by: Ricky <rickhanlonii@gmail.com>

* Remove accidental extra period

Co-authored-by: Ricky <rickhanlonii@gmail.com>
* Add React Fwdays conference

* Update conferences.md

Co-authored-by: Alexey Pyltsyn <lex61rus@gmail.com>
* Update conferences.md

* Update conferences.md

Co-authored-by: Alexey Pyltsyn <lex61rus@gmail.com>
Add missing "how" and "an"
Change 'was' to 'were'.
As referenced in https://reactjs.org/docs/context.html update the example to use the naming conventions used across the page.
@netlify
Copy link

netlify bot commented Apr 5, 2021

Deploy preview for ja-reactjs ready!

Built with commit 512cb9f

https://deploy-preview-399--ja-reactjs.netlify.app

@smikitky
Copy link
Member

@koba04 @potato4d 久しぶりなのですがReactのバージョン更新も含まれているので対応お願いします

Copy link
Member

@koba04 koba04 left a comment

Choose a reason for hiding this comment

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

👍 ありがとうございます!

@koba04 koba04 merged commit bf7f904 into master Apr 12, 2021
@koba04 koba04 deleted the sync-49fd7d5f branch April 12, 2021 01:35
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.