Merge branch 'master' into greenkeeper/react-bootstrap-0.32.1

mozilla · Feb 9, 2018 · 9a5e797 · 9a5e797
2 parents 01b9e04 + 75275fd
commit 9a5e797
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
     "bootstrap": "3",
     "dompurify": "1.0.2",
     "markdown-it": "8.4.0",
-    "react": "16.1.1",
-    "react-bootstrap": "0.32.1",
-    "react-dom": "16.1.1",
+    "react": "16.2.0",
+    "react-bootstrap": "0.32.1",    
+    "react-dom": "16.2.0",
     "react-helmet": "5.0.3",
     "react-router-dom": "4.2.2",
     "reactable": "muffinresearch/reactable"

diff --git a/yarn.lock b/yarn.lock
@@ -5938,9 +5938,9 @@ react-dev-utils@^4.2.1:
     strip-ansi "3.0.1"
     text-table "0.2.0"
 
-react-dom@16.1.1:
-  version "16.1.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
+react-dom@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -6051,9 +6051,9 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.1.1:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react@16.1.1:
-  version "16.1.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
+react@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"