adds ReactRally & Reactive 2016 + conf locations (#6623)
Yan Li committed
Apr 26, 2016 at 18:12 UTC
71179459dee629b4c34ae85d74299dd673dcc419
1 file changed
+15
-5
docs/docs/conferences.md
+15
-5
@@ -7,28 +7,38 @@ next: videos.html
7
---
8
9
### React.js Conf 2015
10
-January 28 & 29
10
+January 28 & 29 in Facebook HQ, CA
11
12
[Website](http://conf2015.reactjs.org/) - [Schedule](http://conf2015.reactjs.org/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr)
13
14
<iframe width="650" height="315" src="//www.youtube-nocookie.com/embed/KVZ-P-ZI6W4?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr" frameborder="0" allowfullscreen></iframe>
15
16
### ReactEurope 2015
17
-July 2 & 3
17
+July 2 & 3 in Paris, France
18
19
[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
20
21
### Reactive 2015
22
-November 2-4
22
+November 2-4 in Bratislava, Slovakia
23
24
[Website](https://reactive2015.com/) - [Schedule](https://reactive2015.com/schedule_speakers.html#schedule)
25
26
### React.js Conf 2016
27
-February 22 & 23
27
+February 22 & 23 in San Francisco, CA
28
29
[Website](http://conf.reactjs.com/) - [Schedule](http://conf.reactjs.com/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS0M8Q95RIc2lOM6nc77q1IY)
30
31
### ReactEurope 2016
32
-June 2 & 3
32
+June 2 & 3 in Paris, France
33
34
[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
35
+
36
+### ReactRally 2016
37
+August 25-26 in Salt Lake City, UT
38
+
39
+[Website](http://www.reactrally.com/) - [Schedule](http://www.reactrally.com/#/schedule)
40
+
41
+### Reactive 2016
42
+October 26-28 in Bratislava, Slovakia
43
+
44
+[Website](https://reactiveconf.com/)