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 @ cb5a61cd #342

Merged
merged 5 commits into from
Jun 28, 2019
Merged

Sync with reactjs.org @ cb5a61cd #342

merged 5 commits into from
Jun 28, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Jun 26, 2019

This PR was automatically generated.

Merge changes from reactjs.org at cb5a61c

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.

EmmaB and others added 4 commits June 23, 2019 14:07
Please refer to https://justsimply.dev for the thinking behind these proposed changes.
An example for useEffect omitted the actual invocation of the function in question.
@netlify
Copy link

netlify bot commented Jun 26, 2019

Deploy preview for ru-reactjs ready!

Built with commit 682c0b7

https://deploy-preview-342--ru-reactjs.netlify.com

Copy link
Collaborator

@another-guy another-guy left a comment

Choose a reason for hiding this comment

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

Merge conflict is resolved.

@another-guy another-guy merged commit b750797 into master Jun 28, 2019
@lex111 lex111 deleted the sync-cb5a61cd branch October 21, 2019 00:36
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.

None yet

4 participants