Merge branch 'master' of https://github.com/reactjs/reactjs.org into …

…sync-e200fd7b
reactjs · Aug 2, 2019 · a6d0688 · a6d0688
2 parents a612c2a + e200fd7
commit a6d0688
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/content/community/conferences.md b/content/community/conferences.md
@@ -72,6 +72,11 @@ February 27 & 28, 2020 in Sydney, Australia
 
 [Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
 
+### Render-Atlanta 2020 {#render-atlanta-2020}
+May 4-6, 2020. Atlanta, GA, USA.
+
+[Website](https://renderatl.com)
+
 ## Past Conferences {#past-conferences}
 
 ### React.js Conf 2015 {#reactjs-conf-2015}
@@ -405,3 +410,4 @@ June 21, 2019 Chicago, Illinois USA
 July 11-12, 2019. Portland, OR, USA.
 
 [Website](https://infinite.red/ChainReactConf)
+