Merge remote-tracking branch 'upstream/master'

reactjs · Jan 15, 2019 · 06b08a2 · 06b08a2
2 parents 1b8dd36 + 60dd46d
commit 06b08a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/content/community/conferences.md b/content/community/conferences.md
@@ -45,6 +45,11 @@ September 26-28, 2019 in Goa, India
 September 6, 2019 in Melbourne, Australia
 [Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
 
+### React New York 2019
+September 13th, 2019. New York, USA
+
+[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
+
 ## Past Conferences
 
 ### React.js Conf 2015

diff --git a/content/docs/hooks-overview.md b/content/docs/hooks-overview.md
@@ -8,9 +8,7 @@ prev: hooks-intro.html
 
 *Hooks* are an upcoming feature that lets you use state and other React features without writing a class. They're currently in React v16.8.0-alpha.0.
 
-Hooks are [backwards-compatible](/docs/hooks-intro.html#no-breaking-changes). This page provides an overview of Hooks for experienced React users.
-
-This is a fast-paced overview. If you get confused, look for a yellow box like this:
+Hooks are [backwards-compatible](/docs/hooks-intro.html#no-breaking-changes). This page provides an overview of Hooks for experienced React users. This is a fast-paced overview. If you get confused, look for a yellow box like this:
 
 >Detailed Explanation
 >

diff --git a/content/versions.yml b/content/versions.yml
@@ -1,5 +1,9 @@
+- title: '16.7'
+  changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#1670-december-19-2018
 - title: '16.6'
+  path: /version/16.6
   changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#1660-october-23-2018
+  url: https://5c11762d4be4d10008916ab1--reactjs.netlify.com/
 - title: '16.5'
   path: /version/16.5
   changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#1650-september-5-2018