From a51ef943840cefb097b82b410bea39f5be36d2d3 Mon Sep 17 00:00:00 2001 From: benhalpern Date: Mon, 26 Oct 2015 16:20:57 -0400 Subject: [PATCH 1/2] Updated conference info --- docs/docs/conferences.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/docs/conferences.md b/docs/docs/conferences.md index a86915a07944b..f280e0e1cbbd2 100644 --- 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 +May 31 - July 4 + +[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule) From 00eddc2060da72e008b578914d3759c8597a3ed8 Mon Sep 17 00:00:00 2001 From: benhalpern Date: Thu, 5 Nov 2015 15:33:52 -0500 Subject: [PATCH 2/2] Fixed ReactEurope date --- docs/docs/conferences.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/conferences.md b/docs/docs/conferences.md index f280e0e1cbbd2..cb4a86d21df30 100644 --- a/docs/docs/conferences.md +++ b/docs/docs/conferences.md @@ -24,6 +24,6 @@ November 2-4 [Website](https://reactive2015.com/) - [Schedule](https://reactive2015.com/schedule_speakers.html#schedule) ### ReactEurope 2016 -May 31 - July 4 +June 2 & 3 [Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)