@samitouri / QOS-React / commits / fbc6977fbc

Conferences (#9234)

* standard format for React Rally * move React Conf 2017 to past conferences

Bernard Lin committed Mar 22, 2017 at 11:40 UTC fbc6977fbc16f7ed9ac3adf4b7990ccbc3794048
1 file changed +6 -5
docs/community/conferences.md
+6 -5
@@ -9,11 +9,6 @@ redirect_from: "docs/conferences.html"
9
10 ## Upcoming Conferences
11
12 -### React Conf 2017
13 -March 13-14 in Santa Clara, CA
14 -
15 -[Website](http://conf.reactjs.org/)
16 -
12 ### React London 2017
13 March 28th at the [QEII Centre, London](http://qeiicentre.london/)
14
@@ -36,6 +31,7 @@ July 10-11 in Portland, Oregon USA
31
32 ### React Rally
33 August 24-25 in Salt Lake City, Utah USA
34 +
35 [Website](http://www.reactrally.com) - [Twitter](https://twitter.com/reactrally)
36
37 ### ReactJS Day 2017
@@ -117,3 +113,8 @@ October 26-28 online
113 January 20-21 in Dornbirn, Austria
114
115 [Website](http://agent.sh/)
116 +
117 +### React Conf 2017
118 +March 13-14 in Santa Clara, CA
119 +
120 +[Website](http://conf.reactjs.org/)