Skip to content

Sync with reactjs.org @ 99e97c33 #124

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 16 commits into from
Feb 16, 2019
Merged

Sync with reactjs.org @ 99e97c33 #124

merged 16 commits into from
Feb 16, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Feb 16, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 99e97c3

The following files have conflicts and may need new translations:

  • src/site-constants.js
  • content/docs/hooks-overview.md
  • content/docs/higher-order-components.md

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.

@smikitky
Copy link
Member

コンフリクト直します

@smikitky
Copy link
Member

確認ですが、これ系は merge master しない方向でいいんですよね

@smikitky smikitky merged commit b2fa746 into master Feb 16, 2019
@potato4d potato4d deleted the sync-99e97c33 branch February 20, 2019 03:49
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.

9 participants