From c212226fff201689c46ec336ea4e9211af3dc858 Mon Sep 17 00:00:00 2001
From: speedskater <speedskater@users.noreply.github.com>
Date: Thu, 24 Mar 2016 08:11:35 +0100
Subject: [PATCH] Updated react conf links

* Added React Conf 2016
* Fixed Links for React Conf 2015
---
 docs/docs/conferences.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/docs/conferences.md b/docs/docs/conferences.md
index cb4a86d21d..3556f933c1 100644
--- a/docs/docs/conferences.md
+++ b/docs/docs/conferences.md
@@ -9,7 +9,7 @@ next: videos.html
 ### React.js Conf 2015
 January 28 & 29
 
-[Website](http://conf.reactjs.com/) - [Schedule](http://conf.reactjs.com/schedule.html) - [Videos](https://www.youtube-nocookie.com/playlist?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr)
+[Website](http://conf2015.reactjs.org/) - [Schedule](http://conf2015.reactjs.org/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr)
 
 <iframe width="650" height="315" src="//www.youtube-nocookie.com/embed/KVZ-P-ZI6W4?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr" frameborder="0" allowfullscreen></iframe>
 
@@ -23,6 +23,11 @@ November 2-4
 
 [Website](https://reactive2015.com/) - [Schedule](https://reactive2015.com/schedule_speakers.html#schedule)
 
+### React.js Conf 2016
+February 22 & 23
+
+[Website](http://conf.reactjs.com/) - [Schedule](http://conf.reactjs.com/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS0M8Q95RIc2lOM6nc77q1IY)
+
 ### ReactEurope 2016
 June 2 & 3