Skip to content

Sync with reactjs.org @ e200fd7b #155

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 4 commits into from
Aug 2, 2019
Merged

Sync with reactjs.org @ e200fd7b #155

merged 4 commits into from
Aug 2, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Aug 2, 2019

This PR was automatically generated.

Merge changes from reactjs.org at e200fd7

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.

Justin E. Samuels and others added 2 commits August 1, 2019 16:41
* Added Render-Atlanta to list of conferences 

The first React focused conference around culture & inclusion will be held in the peach state, May 4 - 6, 2020. Full website is going live August 1, but signup page is currently active via our URL

* Updated Position

Accidentally put it @ the bottom under past conferences

* Fixed order
@netlify
Copy link

netlify bot commented Aug 2, 2019

Deploy preview for ar-reactjs ready!

Built with commit aa45516

https://deploy-preview-155--ar-reactjs.netlify.com

@3imed-jaberi 3imed-jaberi self-assigned this Aug 2, 2019
@3imed-jaberi 3imed-jaberi merged commit 6736589 into master Aug 2, 2019
@iRayan7 iRayan7 deleted the sync-e200fd7b branch August 2, 2019 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants