Skip to content
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

Sync with reactjs.org @ 4367566b #247

Merged
merged 8 commits into from
Feb 12, 2020
Merged

Sync with reactjs.org @ 4367566b #247

merged 8 commits into from
Feb 12, 2020

Conversation

reactjs-translation-bot
Copy link
Contributor

This PR was automatically generated.

Merge changes from reactjs.org at 4367566

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.

numb86 and others added 7 commits February 3, 2020 14:53
Adds details for the July "Chain React 2020" conference in Portland, OR.
It's 2020 already.
On line 40, the phrase following the 'comma and' should be independent (i.e., contain a subject). Alternatively, the comma preceding the 'and' should be deleted, making the dependent clause following the 'and' grammatically acceptable.
@netlify
Copy link

netlify bot commented Feb 10, 2020

Deploy preview for fr-reactjs ready!

Built with commit 08c2c6c

https://deploy-preview-247--fr-reactjs.netlify.com

@tdd tdd merged commit 509a91e into master Feb 12, 2020
@tdd tdd deleted the sync-4367566b branch February 12, 2020 15:54
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.

8 participants