Merge pull request facebook#8674 from neeldeep/patch-1

Update conferences.md
tony-shi · Jan 3, 2017 · 962974c · 962974c
2 parents 7dc5f91 + 2825519
commit 962974c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/docs/community/conferences.md b/docs/community/conferences.md
@@ -14,6 +14,11 @@ January 20-21 in Dornbirn, Austria
 
 [Website](http://agent.sh/)
 
+### React.js Conf 2017
+March 13-14 in Santa Clara, CA
+
+[Website](http://conf.reactjs.org/)
+
 ### ReactEurope 2017
 May 18th & 19th in Paris, France