Merged master and resolved conflicts (#10893)

* Merged master and resolved conflicts * Fixed absolute link in markdown
facebook · Sep 27, 2017 · b08895f · b08895f
1 parent ee01b06
commit b08895f
Show file tree

Hide file tree

Showing 133 changed files with 3,826 additions and 13,349 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -6,8 +6,8 @@
 <PROJECT_ROOT>/.*/node_modules/y18n/.*
 <PROJECT_ROOT>/node_modules/chrome-devtools-frontend/.*
 <PROJECT_ROOT>/node_modules/devtools-timeline-model/.*
-<PROJECT_ROOT>/www/node_modules/.*
 <PROJECT_ROOT>/node_modules/create-react-class/.*
+<PROJECT_ROOT>/www/node_modules/.*
 <PROJECT_ROOT>/.*/__mocks__/.*
 <PROJECT_ROOT>/.*/__tests__/.*