Skip to content

Commit

Permalink
Merge pull request #81 from yahoo/react15
Browse files Browse the repository at this point in the history
Support React 15
  • Loading branch information
kaesonho committed Mar 16, 2016
2 parents 40b1c57 + 985f809 commit 6922cdb
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@
"object-assign": "^4.0.0",
"pre-commit": "^1.0.0",
"promise": "^7.0.1",
"react": "^0.14.0-rc1",
"react-dom": "^0.14.0-rc1",
"react-tools": "<= 0.13.x",
"react": "^15.0.0-rc.1",
"react-dom": "^15.0.0-rc.1",
"xunit-file": "^0.0.7"
},
"keywords": [
Expand All @@ -54,8 +53,8 @@
"instrumentation"
],
"peerDependencies": {
"react": "^0.14.0 || 0.14.0-rc1",
"react-dom": "^0.14.0 || 0.14.0-rc1"
"react": "^0.14.0 || ^15.0.0-rc.1",
"react-dom": "^0.14.0 || ^15.0.0-rc.1"
},
"precommit": [
"lint",
Expand Down

0 comments on commit 6922cdb

Please sign in to comment.