Skip to content

Sync with reactjs.org @ 3846b501 #180

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 9 commits into from
Nov 5, 2019
Merged

Sync with reactjs.org @ 3846b501 #180

merged 9 commits into from
Nov 5, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Nov 4, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 3846b50

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.

jamesmckenzie and others added 8 commits October 28, 2019 20:22
Just made the group back in June -- so its still fairly small, but hopefully listing here will help improve awareness and increase membership.
Add React community in Indonesia
"for a small period time" => "for a small period of time"
* Added React Day Bangalore

* Update conferences.md


Co-authored-by: Alexey Pyltsyn <[email protected]>
* Add more Brazil react meetups

* Fix React Goiania meetup url

* Fix React Juiz de Fora meetup URL
@netlify
Copy link

netlify bot commented Nov 4, 2019

Deploy preview for ko-reactjs-org ready!

Built with commit 00eb0df

https://deploy-preview-180--ko-reactjs-org.netlify.com

=======
const urlRoot = 'https://reactjs.org';
const version = '16.11.0';
>>>>>>> 3846b501066388c4d0bc84fc8389918d9080d5d2
Copy link
Member

Choose a reason for hiding this comment

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

This must be fixed. I will fix this :)

Copy link
Member

Choose a reason for hiding this comment

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

@taehwanno taehwanno merged commit 7d193a1 into master Nov 5, 2019
@taehwanno taehwanno deleted the sync-3846b501 branch November 5, 2019 03:56
@taehwanno taehwanno mentioned this pull request Nov 6, 2019
6 tasks
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