Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Sync with reactjs.org @ bd0c9d8c #66

Merged
merged 14 commits into from
Oct 15, 2021
Merged

Sync with reactjs.org @ bd0c9d8c #66

merged 14 commits into from
Oct 15, 2021

Conversation

reactjs-translation-bot
Copy link
Contributor

This PR was automatically generated.

Merge changes from reactjs.org at bd0c9d8

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.

@netlify
Copy link

netlify bot commented Oct 12, 2020

Deploy preview for th-reactjs ready!

Built with commit ef8638b

https://deploy-preview-66--th-reactjs.netlify.app

@naruthk
Copy link
Contributor

naruthk commented Oct 19, 2020

I made changes in #69 that fixed the merge conflicts in this branch.

@iphayao iphayao merged commit 2cf1772 into main Oct 15, 2021
@iphayao iphayao deleted the sync-bd0c9d8c branch October 15, 2021 15:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants