Skip to content

Commit

Permalink
Merge pull request #5287 from benhalpern/patch-1
Browse files Browse the repository at this point in the history
Updated conference page
  • Loading branch information
sophiebits committed Nov 5, 2015
2 parents 2f7f1a9 + 00eddc2 commit 99fbde5
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions docs/docs/conferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 99fbde5

Please # to comment.