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 @ 12eaa7a9 #246

Merged
merged 4 commits into from
Feb 4, 2020
Merged

Sync with reactjs.org @ 12eaa7a9 #246

merged 4 commits into from
Feb 4, 2020

Conversation

reactjs-translation-bot
Copy link
Contributor

This PR was automatically generated.

Merge changes from reactjs.org at 12eaa7a

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.

wojteg1337 and others added 3 commits February 1, 2020 03:58
* Update conferences list

Add React Native Eu 2020 conference

* Update conferences.md

* Update conferences.md

Co-authored-by: Alexey Pyltsyn <lex61rus@gmail.com>
* Add Panama to React meetup list.

* Update meetups.md

Co-authored-by: Alexey Pyltsyn <lex61rus@gmail.com>
@reactjs-translation-bot reactjs-translation-bot requested review from a user, setheal and tdd February 3, 2020 16:04
@netlify
Copy link

netlify bot commented Feb 3, 2020

Deploy preview for fr-reactjs ready!

Built with commit 5bd7335

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

@tdd tdd merged commit 11f05f9 into master Feb 4, 2020
@tdd tdd deleted the sync-12eaa7a9 branch February 4, 2020 08:58
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.

4 participants