Merge branch 'kamui-react-15'

* kamui-react-15: Add react 15.0 support
civiccc · Apr 9, 2016 · 3cb0c7c · 3cb0c7c
2 parents 60e3c02 + a6b8645
commit 3cb0c7c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
   "author": "Brigade Engineering",
   "license": "MIT",
   "peerDependencies": {
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0"
+    "react": "^0.14.0 || ^15.0.0",
+    "react-dom": "^0.14.0 || ^15.0.0"
   },
   "devDependencies": {
     "babel": "^6.0.0",
@@ -38,8 +38,8 @@
     "karma-firefox-launcher": "^0.1.6",
     "karma-jasmine": "^0.3.6",
     "karma-webpack": "^1.7.0",
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
     "webpack": "^1.5.3"
   },
   "keywords": [