Merge pull request #5287 from benhalpern/patch-1

Updated conference page (cherry picked from commit 99fbde5)
facebook · Nov 10, 2015 · fd05a6e · fd05a6e
1 parent 17761fa
commit fd05a6e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/docs/docs/conferences.md b/docs/docs/conferences.md
@@ -17,3 +17,13 @@ January 28 & 29
 July 2 & 3
 
 [Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
+
+### Reactive 2015
+November 2-4
+
+[Website](https://reactive2015.com/) - [Schedule](https://reactive2015.com/schedule_speakers.html#schedule)
+
+### ReactEurope 2016
+June 2 & 3
+
+[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)